diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-06 18:08:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-06 18:59:44 +0200 |
| commit | e10124b20efb8cb7caf0f02fc537147a6505aa1d (patch) | |
| tree | 4b1590fccf7d083da11a2e7e5b197af34d30b8f4 /glib | |
| parent | 7b58bf4c0bd6614e8ebf8d4fee880a235834323c (diff) | |
Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg
Now with librsvg no longer used, and liblangtag no longer using glib,
a bunch of bundled (in some configurations, always on some platforms)
3rd-party libraries are no longer needed.
Initial work by rene, continued by tml.
Change-Id: I76edd7aea5452e3487499f0b9ed9f767cf760194
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/README | 4 | ||||
| -rw-r--r-- | glib/glib-2.28.1-win32-2.patch | 553 | ||||
| -rw-r--r-- | glib/glib-2.28.1-win32.patch | 1994 | ||||
| -rw-r--r-- | glib/glib-2.28.1.noise.patch | 12 | ||||
| -rw-r--r-- | glib/glib-2.28.1.patch | 153 | ||||
| -rw-r--r-- | glib/makefile.mk | 390 | ||||
| -rw-r--r-- | glib/prj/build.lst | 3 | ||||
| -rw-r--r-- | glib/prj/d.lst | 252 | ||||
| -rw-r--r-- | glib/prj/dmake | 0 |
9 files changed, 0 insertions, 3361 deletions
diff --git a/glib/README b/glib/README deleted file mode 100644 index ef03b75dc349..000000000000 --- a/glib/README +++ /dev/null @@ -1,4 +0,0 @@ -GLib is a general-purpose utility library, which provides many useful data types, macros, -type conversions, string utilities, file utilities, a main loop abstraction, and so on. - -From [ http://www.gtk.org/api/2.6/glib/glib.html ]
\ No newline at end of file diff --git a/glib/glib-2.28.1-win32-2.patch b/glib/glib-2.28.1-win32-2.patch deleted file mode 100644 index ee4b868f6b1a..000000000000 --- a/glib/glib-2.28.1-win32-2.patch +++ /dev/null @@ -1,553 +0,0 @@ ---- misc/glib-2.28.1/build/win32/make.msc 2011-04-01 16:52:15.676157900 +0200 -+++ misc/build/glib-2.28.1/build/win32/make.msc 2011-04-01 16:52:02.168385300 +0200 -@@ -55,7 +55,7 @@ - BABL_LIBS = $(BABL)\babl\babl-1.0.lib - - # force inclusion of the _right_ cairoversion.h even when using without installation --CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO) -+CAIRO_CFLAGS = -I $(CAIRO)\src -I $(CAIRO) - CAIRO_LIBS = $(CAIRO)\src\libcairo.lib - - DIRENT_CFLAGS = -I ..\build\win32\dirent ---- misc/glib-2.28.1/gobject/glib-mkenums 2011-04-01 16:52:15.155128100 +0200 -+++ misc/build/glib-2.28.1/gobject/glib-mkenums 2011-04-01 16:51:30.994602300 +0200 -@@ -1 +1,538 @@ --dummy -+#! perl.exe -+ -+use warnings; -+use File::Basename; -+use Safe; -+ -+# glib-mkenums.pl -+# Information about the current enumeration -+my $flags; # Is enumeration a bitmask? -+my $option_underscore_name; # Overriden underscore variant of the enum name -+ # for example to fix the cases we don't get the -+ # mixed-case -> underscorized transform right. -+my $option_lowercase_name; # DEPRECATED. A lower case name to use as part -+ # of the *_get_type() function, instead of the -+ # one that we guess. For instance, when an enum -+ # uses abnormal capitalization and we can not -+ # guess where to put the underscores. -+my $seenbitshift; # Have we seen bitshift operators? -+my $enum_prefix; # Prefix for this enumeration -+my $enumname; # Name for this enumeration -+my $enumshort; # $enumname without prefix -+my $enumname_prefix; # prefix of $enumname -+my $enumindex = 0; # Global enum counter -+my $firstenum = 1; # Is this the first enumeration per file? -+my @entries; # [ $name, $val ] for each entry -+my $sandbox = Safe->new; # sandbox for safe evaluation of expressions -+ -+sub parse_trigraph { -+ my $opts = shift; -+ my @opts; -+ -+ for $opt (split /\s*,\s*/, $opts) { -+ $opt =~ s/^\s*//; -+ $opt =~ s/\s*$//; -+ my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/; -+ defined $val or $val = 1; -+ push @opts, $key, $val; -+ } -+ @opts; -+} -+sub parse_entries { -+ my $file = shift; -+ my $file_name = shift; -+ my $looking_for_name = 0; -+ -+ while (<$file>) { -+ # read lines until we have no open comments -+ while (m@/\*([^*]|\*(?!/))*$@) { -+ my $new; -+ defined ($new = <$file>) || die "Unmatched comment in $ARGV"; -+ $_ .= $new; -+ } -+ # strip comments w/o options -+ s@/\*(?!<) -+ ([^*]+|\*(?!/))* -+ \*/@@gx; -+ -+ # strip newlines -+ s@\n@ @; -+ -+ # skip empty lines -+ next if m@^\s*$@; -+ -+ if ($looking_for_name) { -+ if (/^\s*(\w+)/) { -+ $enumname = $1; -+ return 1; -+ } -+ } -+ -+ # Handle include files -+ if (/^\#include\s*<([^>]*)>/ ) { -+ my $file= "../$1"; -+ open NEWFILE, $file or die "Cannot open include file $file: $!\n"; -+ -+ if (parse_entries (\*NEWFILE, $NEWFILE)) { -+ return 1; -+ } else { -+ next; -+ } -+ } -+ -+ if (/^\s*\}\s*(\w+)/) { -+ $enumname = $1; -+ $enumindex++; -+ return 1; -+ } -+ -+ if (/^\s*\}/) { -+ $enumindex++; -+ $looking_for_name = 1; -+ next; -+ } -+ -+ if (m@^\s* -+ (\w+)\s* # name -+ (?:=( # value -+ \s*\w+\s*\(.*\)\s* # macro with multiple args -+ | # OR -+ (?:[^,/]|/(?!\*))* # anything but a comma or comment -+ ))?,?\s* -+ (?:/\*< # options -+ (([^*]|\*(?!/))*) -+ >\s*\*/)?,? -+ \s*$ -+ @x) { -+ my ($name, $value, $options) = ($1,$2,$3); -+ -+ if (!defined $flags && defined $value && $value =~ /<</) { -+ $seenbitshift = 1; -+ } -+ -+ if (defined $options) { -+ my %options = parse_trigraph($options); -+ if (!defined $options{skip}) { -+ push @entries, [ $name, $value, $options{nick} ]; -+ } -+ } else { -+ push @entries, [ $name, $value ]; -+ } -+ } elsif (m@^\s*\#@) { -+ # ignore preprocessor directives -+ } else { -+ print STDERR "$0: $file_name:$.: Failed to parse `$_'\n"; -+ } -+ } -+ -+ return 0; -+} -+ -+sub version { -+ print "glib-mkenums version glib-@GLIB_VERSION@\n"; -+ print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n"; -+ print "You may redistribute copies of glib-mkenums under the terms of\n"; -+ print "the GNU General Public License which can be found in the\n"; -+ print "GLib source package. Sources, examples and contact\n"; -+ print "information are available at http://www.gtk.org\n"; -+ exit 0; -+} -+sub usage { -+ print "Usage:\n"; -+ print " glib-mkenums [OPTION...] [FILES...]\n\n"; -+ print "Help Options:\n"; -+ print " -h, --help Show this help message\n\n"; -+ print "Utility Options:\n"; -+ print " --fhead <text> Output file header\n"; -+ print " --fprod <text> Per input file production\n"; -+ print " --ftail <text> Output file trailer\n"; -+ print " --eprod <text> Per enum text (produced prior to value itarations)\n"; -+ print " --vhead <text> Value header, produced before iterating over enum values\n"; -+ print " --vprod <text> Value text, produced for each enum value\n"; -+ print " --vtail <text> Value tail, produced after iterating over enum values\n"; -+ print " --comments <text> Comment structure\n"; -+ print " --template file Template file\n"; -+ print " -v, --version Print version informations\n\n"; -+ print "Production text substitutions:\n"; -+ print " \@EnumName\@ PrefixTheXEnum\n"; -+ print " \@enum_name\@ prefix_the_xenum\n"; -+ print " \@ENUMNAME\@ PREFIX_THE_XENUM\n"; -+ print " \@ENUMSHORT\@ THE_XENUM\n"; -+ print " \@ENUMPREFIX\@ PREFIX\n"; -+ print " \@VALUENAME\@ PREFIX_THE_XVALUE\n"; -+ print " \@valuenick\@ the-xvalue\n"; -+ print " \@valuenum\@ the integer value (limited support, Since: 2.26)\n"; -+ print " \@type\@ either enum or flags\n"; -+ print " \@Type\@ either Enum or Flags\n"; -+ print " \@TYPE\@ either ENUM or FLAGS\n"; -+ print " \@filename\@ name of current input file\n"; -+ print " \@basename\@ base name of the current input file (Since: 2.22)\n"; -+ exit 0; -+} -+ -+# production variables: -+my $fhead = ""; # output file header -+my $fprod = ""; # per input file production -+my $ftail = ""; # output file trailer -+my $eprod = ""; # per enum text (produced prior to value itarations) -+my $vhead = ""; # value header, produced before iterating over enum values -+my $vprod = ""; # value text, produced for each enum value -+my $vtail = ""; # value tail, produced after iterating over enum values -+my $comment_tmpl = ""; # comment template -+ -+sub read_template_file { -+ my ($file) = @_; -+ my %tmpl = ('file-header', $fhead, -+ 'file-production', $fprod, -+ 'file-tail', $ftail, -+ 'enumeration-production', $eprod, -+ 'value-header', $vhead, -+ 'value-production', $vprod, -+ 'value-tail', $vtail, -+ 'comment', $comment_tmpl); -+ my $in = 'junk'; -+ open (FILE, $file) || die "Can't open $file: $!\n"; -+ while (<FILE>) { -+ if (/^\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\//) { -+ if (($in eq 'junk') && ($1 eq 'BEGIN') && (exists($tmpl{$2}))) { -+ $in = $2; -+ next; -+ } -+ elsif (($in eq $2) && ($1 eq 'END') && (exists($tmpl{$2}))) { -+ $in = 'junk'; -+ next; -+ } else { -+ die "Malformed template file $file\n"; -+ } -+ } -+ if (!($in eq 'junk')) { -+ $tmpl{$in} .= $_; -+ } -+ } -+ close (FILE); -+ if (!($in eq 'junk')) { -+ die "Malformed template file $file\n"; -+ } -+ $fhead = $tmpl{'file-header'}; -+ $fprod = $tmpl{'file-production'}; -+ $ftail = $tmpl{'file-tail'}; -+ $eprod = $tmpl{'enumeration-production'}; -+ $vhead = $tmpl{'value-header'}; -+ $vprod = $tmpl{'value-production'}; -+ $vtail = $tmpl{'value-tail'}; -+ $comment_tmpl = $tmpl{'comment'}; -+ -+ # default to C-style comments -+ $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq ""; -+} -+ -+if (!defined $ARGV[0]) { -+ usage; -+} -+while ($_=$ARGV[0],/^-/) { -+ shift; -+ last if /^--$/; -+ if (/^--template$/) { read_template_file (shift); } -+ elsif (/^--fhead$/) { $fhead = $fhead . shift } -+ elsif (/^--fprod$/) { $fprod = $fprod . shift } -+ elsif (/^--ftail$/) { $ftail = $ftail . shift } -+ elsif (/^--eprod$/) { $eprod = $eprod . shift } -+ elsif (/^--vhead$/) { $vhead = $vhead . shift } -+ elsif (/^--vprod$/) { $vprod = $vprod . shift } -+ elsif (/^--vtail$/) { $vtail = $vtail . shift } -+ elsif (/^--comments$/) { $comment_tmpl = shift } -+ elsif (/^--help$/ || /^-h$/ || /^-\?$/) { usage; } -+ elsif (/^--version$/ || /^-v$/) { version; } -+ else { usage; } -+ last if not defined($ARGV[0]); -+} -+ -+# put auto-generation comment -+{ -+ my $comment = $comment_tmpl; -+ $comment =~ s/\@comment\@/Generated data (by glib-mkenums)/; -+ print "\n" . $comment . "\n\n"; -+} -+ -+if (length($fhead)) { -+ my $prod = $fhead; -+ my $base = basename ($ARGV[0]); -+ -+ $prod =~ s/\@filename\@/$ARGV[0]/g; -+ $prod =~ s/\@basename\@/$base/g; -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+} -+ -+while (<>) { -+ if (eof) { -+ close (ARGV); # reset line numbering -+ $firstenum = 1; # Flag to print filename at next enum -+ } -+ -+ # read lines until we have no open comments -+ while (m@/\*([^*]|\*(?!/))*$@) { -+ my $new; -+ defined ($new = <>) || die "Unmatched comment in $ARGV"; -+ $_ .= $new; -+ } -+ # strip comments w/o options -+ s@/\*(?!<) -+ ([^*]+|\*(?!/))* -+ \*/@@gx; -+ -+ if (m@^\s*typedef\s+enum\s* -+ ({)?\s* -+ (?:/\*< -+ (([^*]|\*(?!/))*) -+ >\s*\*/)? -+ \s*({)? -+ @x) { -+ if (defined $2) { -+ my %options = parse_trigraph ($2); -+ next if defined $options{skip}; -+ $enum_prefix = $options{prefix}; -+ $flags = $options{flags}; -+ $option_lowercase_name = $options{lowercase_name}; -+ $option_underscore_name = $options{underscore_name}; -+ } else { -+ $enum_prefix = undef; -+ $flags = undef; -+ $option_lowercase_name = undef; -+ $option_underscore_name = undef; -+ } -+ if (defined $option_lowercase_name) { -+ if (defined $option_underscore_name) { -+ print STDERR "$0: $ARGV:$.: lowercase_name overriden with underscore_name\n"; -+ $option_lowercase_name = undef; -+ } else { -+ print STDERR "$0: $ARGV:$.: lowercase_name is deprecated, use underscore_name\n"; -+ } -+ } -+ # Didn't have trailing '{' look on next lines -+ if (!defined $1 && !defined $4) { -+ while (<>) { -+ if (s/^\s*\{//) { -+ last; -+ } -+ } -+ } -+ -+ $seenbitshift = 0; -+ @entries = (); -+ -+ # Now parse the entries -+ parse_entries (\*ARGV, $ARGV); -+ -+ # figure out if this was a flags or enums enumeration -+ if (!defined $flags) { -+ $flags = $seenbitshift; -+ } -+ -+ # Autogenerate a prefix -+ if (!defined $enum_prefix) { -+ for (@entries) { -+ my $nick = $_->[2]; -+ if (!defined $nick) { -+ my $name = $_->[0]; -+ if (defined $enum_prefix) { -+ my $tmp = ~ ($name ^ $enum_prefix); -+ ($tmp) = $tmp =~ /(^\xff*)/; -+ $enum_prefix = $enum_prefix & $tmp; -+ } else { -+ $enum_prefix = $name; -+ } -+ } -+ } -+ if (!defined $enum_prefix) { -+ $enum_prefix = ""; -+ } else { -+ # Trim so that it ends in an underscore -+ $enum_prefix =~ s/_[^_]*$/_/; -+ } -+ } else { -+ # canonicalize user defined prefixes -+ $enum_prefix = uc($enum_prefix); -+ $enum_prefix =~ s/-/_/g; -+ $enum_prefix =~ s/(.*)([^_])$/$1$2_/; -+ } -+ -+ for $entry (@entries) { -+ my ($name,$num,$nick) = @{$entry}; -+ if (!defined $nick) { -+ ($nick = $name) =~ s/^$enum_prefix//; -+ $nick =~ tr/_/-/; -+ $nick = lc($nick); -+ @{$entry} = ($name, $num, $nick); -+ } -+ } -+ -+ -+ # Spit out the output -+ if (defined $option_underscore_name) { -+ $enumlong = uc $option_underscore_name; -+ $enumsym = lc $option_underscore_name; -+ $enumshort = $enumlong; -+ $enumshort =~ s/^[A-Z][A-Z0-9]*_//; -+ -+ $enumname_prefix = $enumlong; -+ $enumname_prefix =~ s/$enumshort$//; -+ } else { -+ # enumname is e.g. GMatchType -+ $enspace = $enumname; -+ $enspace =~ s/^([A-Z][a-z]*).*$/$1/; -+ -+ $enumshort = $enumname; -+ $enumshort =~ s/^[A-Z][a-z]*//; -+ $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g; -+ $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g; -+ $enumshort = uc($enumshort); -+ -+ $enumname_prefix = $enumname; -+ $enumname_prefix =~ s/^([A-Z][a-z]*).*$/$1/; -+ $enumname_prefix = uc($enumname_prefix); -+ -+ $enumlong = uc($enspace) . "_" . $enumshort; -+ $enumsym = lc($enspace) . "_" . lc($enumshort); -+ -+ if (defined($option_lowercase_name)) { -+ $enumsym = $option_lowercase_name; -+ } -+ } -+ -+ if ($firstenum) { -+ $firstenum = 0; -+ -+ if (length($fprod)) { -+ my $prod = $fprod; -+ my $base = basename ($ARGV); -+ -+ $prod =~ s/\@filename\@/$ARGV/g; -+ $prod =~ s/\@basename\@/$base/g; -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+ } -+ } -+ -+ if (length($eprod)) { -+ my $prod = $eprod; -+ -+ $prod =~ s/\@enum_name\@/$enumsym/g; -+ $prod =~ s/\@EnumName\@/$enumname/g; -+ $prod =~ s/\@ENUMSHORT\@/$enumshort/g; -+ $prod =~ s/\@ENUMNAME\@/$enumlong/g; -+ $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g; -+ if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; } -+ if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; } -+ if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; } -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+ } -+ -+ if (length($vhead)) { -+ my $prod = $vhead; -+ -+ $prod =~ s/\@enum_name\@/$enumsym/g; -+ $prod =~ s/\@EnumName\@/$enumname/g; -+ $prod =~ s/\@ENUMSHORT\@/$enumshort/g; -+ $prod =~ s/\@ENUMNAME\@/$enumlong/g; -+ $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g; -+ if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; } -+ if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; } -+ if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; } -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+ } -+ -+ if (length($vprod)) { -+ my $prod = $vprod; -+ my $next_num = 0; -+ -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ for (@entries) { -+ my ($name,$num,$nick) = @{$_}; -+ my $tmp_prod = $prod; -+ -+ if ($prod =~ /\@valuenum\@/) { -+ # only attempt to eval the value if it is requested -+ # this prevents us from throwing errors otherwise -+ if (defined $num) { -+ # use sandboxed perl evaluation as a reasonable -+ # approximation to C constant folding -+ $num = $sandbox->reval ($num); -+ -+ # make sure it parsed to an integer -+ if (!defined $num or $num !~ /^-?\d+$/) { -+ die "Unable to parse enum value '$num'"; -+ } -+ } else { -+ $num = $next_num; -+ } -+ -+ $tmp_prod =~ s/\@valuenum\@/$num/g; -+ $next_num = $num + 1; -+ } -+ -+ $tmp_prod =~ s/\@VALUENAME\@/$name/g; -+ $tmp_prod =~ s/\@valuenick\@/$nick/g; -+ if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; } -+ if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; } -+ if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; } -+ chomp ($tmp_prod); -+ -+ print "$tmp_prod\n"; -+ } -+ } -+ -+ if (length($vtail)) { -+ my $prod = $vtail; -+ -+ $prod =~ s/\@enum_name\@/$enumsym/g; -+ $prod =~ s/\@EnumName\@/$enumname/g; -+ $prod =~ s/\@ENUMSHORT\@/$enumshort/g; -+ $prod =~ s/\@ENUMNAME\@/$enumlong/g; -+ $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g; -+ if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; } -+ if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; } -+ if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; } -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+ } -+ } -+} -+ -+if (length($ftail)) { -+ my $prod = $ftail; -+ my $base = basename ($ARGV); -+ -+ $prod =~ s/\@filename\@/$ARGV/g; -+ $prod =~ s/\@basename\@/$base/g; -+ $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g; -+ $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g; -+ chomp ($prod); -+ -+ print "$prod\n"; -+} -+ -+# put auto-generation comment -+{ -+ my $comment = $comment_tmpl; -+ $comment =~ s/\@comment\@/Generated data ends here/; -+ print "\n" . $comment . "\n\n"; -+} diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch deleted file mode 100644 index 7cfd09bea7e1..000000000000 --- a/glib/glib-2.28.1-win32.patch +++ /dev/null @@ -1,1994 +0,0 @@ ---- misc/glib-2.28.1/build/win32/dirent/makefile.msc 2009-04-01 01:04:20.000000000 +0200 -+++ misc/build/glib-2.28.1/build/win32/dirent/makefile.msc 2011-03-04 09:06:56.391118000 +0100 -@@ -1,10 +1,10 @@ - TOP = ..\..\..\.. - --!INCLUDE $(TOP)\glib\build\win32\make.msc -+!INCLUDE ..\make.msc - - dirent_OBJECTS = dirent.obj wdirent.obj - --INCLUDES = -I. -+INCLUDES = -I. $(SOLARINC) - - all : dirent.lib - -@@ -12,5 +12,5 @@ - lib /out:dirent.lib /nodefaultlib $(dirent_OBJECTS) - - clean:: -- del /f $(dirent_OBJECTS) -- del /f dirent.lib -+ rm /f $(dirent_OBJECTS) -+ rm /f dirent.lib ---- misc/glib-2.28.1/build/win32/make.msc 2009-08-29 04:52:21.000000000 +0200 -+++ misc/build/glib-2.28.1/build/win32/make.msc 2011-03-04 12:36:27.513145100 +0100 -@@ -35,7 +35,7 @@ - XSLTPROC = d:\gnome-0\xsltproc - - # paths and version numbers --!INCLUDE $(TOP)\glib\build\win32\module.defs -+!INCLUDE module.defs - - ################ - # CFLAGS and LIBS for the packages in module.defs. -@@ -58,8 +58,8 @@ - CAIRO_CFLAGS = -FI $(CAIRO)\cairo-version.h -I $(CAIRO)\src -I $(CAIRO) - CAIRO_LIBS = $(CAIRO)\src\libcairo.lib - --DIRENT_CFLAGS = -I $(GLIB)\build\win32\dirent --DIRENT_LIBS = $(GLIB)\build\win32\dirent\dirent.lib -+DIRENT_CFLAGS = -I ..\build\win32\dirent -+DIRENT_LIBS = ..\build\win32\dirent\dirent.lib - - !IFNDEF EXIF - EXIF_CFLAGS = -I $(DEVTOP)\include -@@ -92,7 +92,7 @@ - # overide definition to use it as callable path - GLIB = $(TOP)\glib - --GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS) -+GLIB_CFLAGS = -I $(GLIB) -I $(GLIB)\glib -I $(GLIB)\gmodule $(INTL_CFLAGS) $(SOLARINC) - GLIB_LIBS = $(GLIB)\glib\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib $(GLIB)\gobject\gobject-$(GLIB_VER).lib $(GLIB)\gio\gio-$(GLIB_VER).lib - GTHREAD_LIBS = $(GLIB)\gthread\gthread-$(GLIB_VER).lib - -@@ -126,11 +126,11 @@ - LIBART_LIBS = $(LIBART)\art_lgpl_2.lib - - !IFNDEF INTL --INTL_CFLAGS = -I $(DEVTOP)\include --INTL_LIBS = $(DEVTOP)\lib\intl.lib -+INTL_CFLAGS = -I $(OUTDIR)\inc\external -+INTL_LIBS = $(OUTDIR)/lib/intl.lib - !ELSE --INTL_CFLAGS = -I $(INTL) --INTL_LIBS = $(INTL)\intl.lib -+INTL_CFLAGS = -I $(OUTDIR)\inc\external -+INTL_LIBS = $(OUTDIR)/lib/intl.lib - !ENDIF - - !IFDEF LCMS -@@ -199,10 +199,10 @@ - - !IFDEF ZLIB - ZLIB_CFLAGS = -I $(ZLIB) --ZLIB_LIBS = $(ZLIB)\projects\visualc6\Win32_LIB_Release\zlib.lib -+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib - !ELSE --ZLIB_CFLAGS = -I $(DEVTOP)\include --ZLIB_LIBS = $(DEVTOP)\lib\zdll.lib -+ZLIB_CFLAGS = -I $(OUTDIR)\inc\external\zlib -+ZLIB_LIBS = $(OUTDIR)\lib\zlib.lib - !ENDIF - - ################ ---- misc/glib-2.28.1/gio/gzlibcompressor.c 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/gio/gzlibcompressor.c 2011-03-07 10:33:19.559189800 +0100 -@@ -25,7 +25,7 @@ - #include "gzlibcompressor.h" - - #include <errno.h> --#include <zlib.h> -+#include <zlib/zlib.h> - #include <string.h> - - #include "gfileinfo.h" -@@ -64,8 +64,10 @@ - - GZlibCompressorFormat format; - int level; -+#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 - z_stream zstream; - gz_header gzheader; -+#endif - GFileInfo *file_info; - }; - -@@ -73,7 +75,7 @@ - g_zlib_compressor_set_gzheader (GZlibCompressor *compressor) - { - /* On win32, these functions were not exported before 1.2.4 */ --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - const gchar *filename; - - if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP || ---- misc/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-07 09:13:41.324890400 +0100 -+++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c 2011-03-04 11:28:39.712480200 +0100 -@@ -25,7 +25,7 @@ - #include "gzlibdecompressor.h" - - #include <errno.h> --#include <zlib.h> -+#include <zlib/zlib.h> - #include <string.h> - - #include "gfileinfo.h" -@@ -76,7 +76,7 @@ - g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor) - { - /* On win32, these functions were not exported before 1.2.4 */ --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP) - return; - -@@ -376,7 +376,7 @@ - *bytes_read = inbuf_size - decompressor->zstream.avail_in; - *bytes_written = outbuf_size - decompressor->zstream.avail_out; - --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - if (decompressor->header_data != NULL && - decompressor->header_data->gzheader.done == 1) - { ---- misc/glib-2.28.1/gio/makefile.msc 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/gio/makefile.msc 2011-03-04 12:43:54.423706900 +0100 -@@ -3,9 +3,9 @@ - PRJ_TOP = .. - PACKAGE = gio - PKG_VER = 2.0 --!INCLUDE $(TOP)\glib\build\win32\make.msc -+!INCLUDE ..\build\win32\make.msc - --SUBDIRS = win32 -+SUBDIRS = win32 gvdb - - sub-all: - for %d in ($(SUBDIRS)) do nmake -nologo -f makefile.msc sub-one THIS=%d -@@ -18,13 +18,15 @@ - INCLUDES = \ - -FImsvc_recommended_pragmas.h \ - -I .. -I ..\glib -I ..\gmodule -I . \ -- $(INTL_CFLAGS) -+ $(INTL_CFLAGS) \ -+ $(SOLARINC) \ - - DEFINES = \ - -DG_LOG_DOMAIN=\"GLib-GIO\" \ - -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \ - -DGIO_COMPILATION - -+ - appinfo_sources = \ - gwin32appinfo.c gwin32appinfo.h - -@@ -75,19 +77,50 @@ - $(NULL) - - OBJECTS = \ -+ gaction.obj \ -+ gactiongroup.obj \ - gappinfo.obj \ -+ gapplication.obj \ -+ gapplicationcommandline.obj \ -+ gapplicationimpl-dbus.obj \ - gasynchelper.obj \ - gasyncinitable.obj \ - gasyncresult.obj \ - gbufferedinputstream.obj \ - gbufferedoutputstream.obj \ - gcancellable.obj \ -+ gcharsetconverter.obj \ - gcontenttype.obj \ -+ gconverter.obj \ -+ gconverterinputstream.obj \ -+ gconverteroutputstream.obj \ -+ gcredentials.obj \ - gdatainputstream.obj \ - gdataoutputstream.obj \ -+ gdbusaddress.obj \ -+ gdbusauth.obj \ -+ gdbusauthmechanism.obj \ -+ gdbusauthmechanismanon.obj \ -+ gdbusauthmechanismexternal.obj \ -+ gdbusauthmechanismsha1.obj \ -+ gdbusauthobserver.obj \ -+ gdbusconnection.obj \ -+ gdbuserror.obj \ -+ gdbusintrospection.obj \ -+ gdbusmessage.obj \ -+ gdbusmethodinvocation.obj \ -+ gdbusnameowning.obj \ -+ gdbusnamewatching.obj \ -+ gdbusprivate.obj \ -+ gdbusproxy.obj \ -+ gdbusserver.obj \ -+ gdbusutils.obj \ -+ gdelayedsettingsbackend.obj \ - # gdesktopappinfo.obj \ - gdrive.obj \ - gdummyfile.obj \ -+ gdummyproxyresolver.obj \ -+ gdummytlsbackend.obj \ - gemblem.obj \ - gemblemedicon.obj \ - gfile.obj \ -@@ -112,20 +145,39 @@ - giomodule.obj \ - gioscheduler.obj \ - giostream.obj \ -+ gkeyfilesettingsbackend.obj \ - gloadableicon.obj \ - glocalfileiostream.obj \ - gmemoryinputstream.obj \ - gmemoryoutputstream.obj \ -+ gmemorysettingsbackend.obj \ - gmount.obj \ - gmountoperation.obj \ - gnativevolumemonitor.obj \ - gnetworkaddress.obj \ - gnetworkservice.obj \ -+ gnullsettingsbackend.obj \ - goutputstream.obj \ -+ gpermission.obj \ -+ gpollableinputstream.obj \ -+ gpollableoutputstream.obj \ - gpollfilemonitor.obj \ -+ gproxy.obj\ -+ gproxyaddress.obj \ -+ gproxyaddressenumerator.obj \ -+ gproxyresolver.obj \ -+ gregistrysettingsbackend.obj \ - gresolver.obj \ -+ gsettings-mapping.obj \ -+ gsettings-tool.obj \ -+ gsettings.obj \ -+ gsettingsbackend.obj \ -+ gsettingsschema.obj \ - gseekable.obj \ -+ gsimpleaction.obj \ -+ gsimpleactiongroup.obj \ - gsimpleasyncresult.obj \ -+ gsimplepermission.obj \ - gsocket.obj \ - gsocketaddress.obj \ - gsocketaddressenumerator.obj \ -@@ -135,13 +187,22 @@ - gsocketcontrolmessage.obj \ - gsocketlistener.obj \ - gsocketservice.obj \ -+ gsocks4aproxy.obj \ -+ gsocks4proxy.obj \ -+ gsocks5proxy.obj \ - gsocketinputstream.obj \ - gsocketoutputstream.obj \ - gsrvtarget.obj \ - gtcpconnection.obj \ -+ gtcpwrapperconnection.obj \ - gthreadedresolver.obj \ - gthreadedsocketservice.obj \ - gthemedicon.obj \ -+ gtlsbackend.obj \ -+ gtlscertificate.obj \ -+ gtlsclientconnection.obj \ -+ gtlsconnection.obj \ -+ gtlsserverconnection.obj \ - gunionvolumemonitor.obj \ - gvfs.obj \ - gvolume.obj \ -@@ -156,11 +217,15 @@ - glocalfilemonitor.obj \ - glocaldirectorymonitor.obj \ - gwin32appinfo.obj \ -+ gwin32outputstream.obj \ - \ - gio-marshal.obj \ -+ gwin32inputstream.obj \ - gwin32mount.obj \ - gwin32volumemonitor.obj \ -- gwin32resolver.obj -+ gwin32resolver.obj \ -+ gzlibdecompressor.obj \ -+ gzlibcompressor.obj - - libgio_2_0_la_LIBADD = \ - $(top_builddir)/glib/libglib-2.0.la \ -@@ -190,14 +255,14 @@ - - gio-marshal.h: gio-marshal.list - $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --header >> xgen-gwmh \ -- && copy /y xgen-gwmh gio-marshal.h \ -- && del xgen-gwmh xgen-gwmh~ -+ && cp xgen-gwmh gio-marshal.h \ -+ && rm xgen-gwmh xgen-gwmh~ - - gio-marshal.c: gio-marshal.h - echo #include "gio-marshal.h" >> xgen-gwmc \ - && $(GLIB_GEN_MARSHAL) --prefix=_gio_marshal gio-marshal.list --body >> xgen-gwmc \ -- && copy xgen-gwmc gio-marshal.c \ -- && del xgen-gwmc xgen-gwmc~ -+ && cp xgen-gwmc gio-marshal.c \ -+ && rm xgen-gwmc xgen-gwmc~ - - local_sources = \ - glocaldirectorymonitor.c \ -@@ -228,11 +293,11 @@ - gio-marshal.c \ - gioenumtypes.h \ - gioenumtypes.c \ -- libgio-$(PKG_VER)-0.dll -+ giolo.dll - - - $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32 -- copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h -+ cp $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h - - gioenumtypes.h: $(gio_headers) gioenumtypes.h.template - $(PERL) ..\gobject\glib-mkenums --template gioenumtypes.h.template $(gio_headers) > gioenumtypes.h -@@ -245,14 +310,14 @@ - RESOURCE = $(PACKAGE).res - - $(PACKAGE).res : $(PACKAGE).rc -- rc -DBUILDNUMBER=0 -r -fo $(PACKAGE).res $(PACKAGE).rc -+ rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo $(PACKAGE).res $(PACKAGE).rc - --libgio-$(PKG_VER)-0.dll : $(OBJECTS) win32\giowin32.lib $(PACKAGE).def $(RESOURCE) -- $(CC) $(CFLAGS) -LD -Felibgio-$(PKG_VER)-0.dll $(OBJECTS) $(RESOURCE) \ -+giolo.dll : $(OBJECTS) win32\giowin32.lib gvdb\giogvdb.lib $(PACKAGE).def $(RESOURCE) -+ $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(RESOURCE) \ - ..\glib\glib-2.0.lib ..\gobject\gobject-2.0.lib ..\gmodule\gmodule-2.0.lib \ -- win32\giowin32.lib \ -- $(INTL_LIBS) \ -- kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \ -+ win32\giowin32.lib gvdb\giogvdb.lib \ -+ $(INTL_LIBS) $(ZLIB_LIBS) \ -+ kernel32.lib user32.lib advapi32.lib shell32.lib wsock32.lib shlwapi.lib ws2_32.lib dnsapi.lib mpr.lib $(LDFLAGS) \ - /implib:gio-2.0.lib /def:$(PACKAGE).def - - .c.obj : ---- misc/glib-2.28.1/glib/gatomic.c 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/glib/gatomic.c 2011-02-25 15:51:45.000000000 +0100 -@@ -28,6 +28,7 @@ - #endif - - #include "gatomic.h" -+#include "gthread.h" - #include "gthreadprivate.h" - - /** ---- misc/glib-2.28.1/glib/gnulib/makefile.msc 2009-04-01 01:04:20.000000000 +0200 -+++ misc/build/glib-2.28.1/glib/gnulib/makefile.msc 2011-03-04 08:37:50.624265900 +0100 -@@ -1,7 +1,7 @@ - TOP = ..\..\.. - !INCLUDE ..\..\build\win32\make.msc - --INCLUDES = -I ..\.. -I .. -+INCLUDES = -I ..\.. -I .. $(SOLARINC) - DEFINES = -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT - - OBJECTS = \ ---- misc/glib-2.28.1/glib/makefile.msc 2011-02-18 16:34:53.000000000 +0100 -+++ misc/build/glib-2.28.1/glib/makefile.msc 2011-03-07 11:41:13.874227300 +0100 -@@ -7,7 +7,7 @@ - - ################################################################ - --INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -+INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. $(SOLARINC) - DEFINES = \ - -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" \ - -DG_ENABLE_DEBUG -DPCRE_STATIC -DG_DISABLE_DEPRECATED \ -@@ -17,13 +17,11 @@ - - all : \ - ..\config.h \ -- ..\glibconfig.h \ -+ glibconfig.h \ - gnulib\gnulib.lib \ - pcre\pcre.lib \ -- libglib-2.0-0.dll \ -+ gliblo.dll \ -- glib-2.28s.lib \ -- gspawn-win32-helper.exe \ -- gspawn-win32-helper-console.exe \ -+ glib-2.28s.lib - - - gnulib\gnulib.lib : -@@ -37,37 +35,40 @@ - cd .. - - glib_OBJECTS = \ -- garray.obj \ -- gasyncqueue.obj \ -- gatomic.obj \ -- gbacktrace.obj \ -- gbase64.obj \ -+ garray.obj \ -+ gasyncqueue.obj \ -+ gatomic.obj \ -+ gbacktrace.obj \ -+ gbase64.obj \ -+ gbitlock.obj \ - gbookmarkfile.obj \ -+ gbuffer.obj \ - gcache.obj \ -- gchecksum.obj \ -- gcompletion.obj \ -+ gchecksum.obj \ - gconvert.obj \ -+ gcompletion.obj \ - gdataset.obj \ - gdate.obj \ -+ gdatetime.obj \ - gdir.obj \ - gerror.obj \ - gfileutils.obj \ - ghash.obj \ -- ghostutils.obj \ - ghook.obj \ -+ ghostutils.obj \ - giochannel.obj \ - giowin32.obj \ -- gpoll.obj \ - gkeyfile.obj \ - glist.obj \ - gmain.obj \ -- gmappedfile.obj \ -+ gmappedfile.obj \ - gmarkup.obj \ - gmem.obj \ - gmessages.obj \ - gnode.obj \ - goption.obj \ - gpattern.obj \ -+ gpoll.obj \ - gprimes.obj \ - gprintf.obj \ - gqsort.obj \ -@@ -88,22 +89,29 @@ - gthread.obj \ - gthreadpool.obj \ - gtimer.obj \ -+ gtimezone.obj \ - gtree.obj \ - gunibreak.obj \ - gunicollate.obj \ - gunidecomp.obj \ - guniprop.obj \ - gurifuncs.obj \ -- gutf8.obj \ -- gutils.obj \ -- gwin32.obj \ -+ gutf8.obj \ -+ gutils.obj \ -+ gvariant-core.obj \ -+ gvariant-parser.obj \ -+ gvariant-serialiser.obj \ -+ gvariant.obj \ -+ gvarianttype.obj \ -+ gvarianttypeinfo.obj \ -+ gwin32.obj \ - localcharset.obj - --..\glibconfig.h: ..\glibconfig.h.win32 -- copy ..\glibconfig.h.win32 ..\glibconfig.h -+glibconfig.h: glibconfig.h.win32 -+ cp glibconfig.h.win32 glibconfig.h - - ..\config.h: ..\config.h.win32 -- copy ..\config.h.win32 ..\config.h -+ cp ..\config.h.win32 ..\config.h - - localcharset.obj : libcharset\localcharset.c - $(CC) $(CFLAGS) -DLIBDIR=\".\" -c libcharset\localcharset.c -@@ -115,7 +123,7 @@ - -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT glib.symbols >> glib.def - - glib.res : glib.rc -- rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc -+ rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo glib.res glib.rc - - ################ glib - -@@ -124,20 +132,14 @@ - glib-2.28s.lib : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib - lib /out:glib-2.28s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib - --libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res -+gliblo.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res - $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \ - gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \ - $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def - --gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-0.dll -- $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib -- --gspawn-win32-helper-console.exe : gspawn-win32-helper.c libglib-2.0-0.dll -- $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:console user32.lib -- - ################ other stuff - - clean:: -- del ..\config.h -- del ..\glibconfig.h -+ rm ..\config.h -+ rm glibconfig.h - ---- misc/glib-2.28.1/glib/pcre/makefile.msc 2010-06-20 06:35:47.000000000 +0200 -+++ misc/build/glib-2.28.1/glib/pcre/makefile.msc 2011-03-04 09:06:02.748049800 +0100 -@@ -3,7 +3,8 @@ - - INCLUDES = \ - -I ..\.. \ -- -I .. -+ -I .. \ -+ $(SOLARINC) - - DEFINES = \ - -DPCRE_STATIC \ -@@ -18,10 +19,24 @@ - -DMAX_NAME_COUNT=10000 \ - -DMAX_DUPLENGTH=30000 \ - -DLINK_SIZE=2 \ -- -DEBCDIC=0 \ - -DPOSIX_MALLOC_THRESHOLD=10 - - OBJECTS = \ -+ pcre_chartables.obj \ -+ pcre_compile.obj \ -+ pcre_config.obj \ -+ pcre_dfa_exec.obj \ -+ pcre_exec.obj \ -+ pcre_fullinfo.obj \ -+ pcre_get.obj \ -+ pcre_globals.obj \ -+ pcre_newline.obj \ -+ pcre_ord2utf8.obj \ -+ pcre_study.obj \ -+ pcre_tables.obj \ -+ pcre_try_flipped.obj \ -+ pcre_ucp_searchfuncs.obj \ -+ pcre_xclass.obj \ - - - all : pcre.lib ---- misc/glib-2.28.1/gmodule/makefile.msc 2011-02-18 16:34:58.000000000 +0100 -+++ misc/build/glib-2.28.1/gmodule/makefile.msc 2011-03-04 08:43:06.896355600 +0100 -@@ -7,12 +7,12 @@ - - ################################################################ - --INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib -+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC) - DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" - - all : \ - gmoduleconf.h \ -- libgmodule-2.0-0.dll -+ gmodulelo.dll - - gmodule_OBJECTS = \ - gmodule.obj -@@ -16,22 +16,22 @@ - - gmodule_OBJECTS = \ - gmodule.obj --gmodule.def: gmodule.symbols
-- echo EXPORTS > gmodule.def
-- cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
-- -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
-- -DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
--
-+gmodule.def: gmodule.symbols -+ echo EXPORTS > gmodule.def -+ cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \ -+ -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \ -+ -DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def -+ - - gmoduleconf.h: gmoduleconf.h.win32 -- copy gmoduleconf.h.win32 gmoduleconf.h -+ cp gmoduleconf.h.win32 gmoduleconf.h - - gmodule.res : gmodule.rc -- rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc -+ rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gmodule.res gmodule.rc - --libgmodule-2.0-0.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res -+gmodulelo.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res - $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \ - ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def - - clean:: -- del gmoduleconf.h -+ rm gmoduleconf.h ---- misc/glib-2.28.1/gobject/makefile.msc 2011-02-18 16:35:05.000000000 +0100 -+++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-04 12:33:52.399273100 +0100 ---- misc/glib-2.28.1/gobject/makefile.msc 2011-02-18 16:35:05.000000000 +0100 -+++ misc/build/glib-2.28.1/gobject/makefile.msc 2011-03-09 09:29:52.712284300 +0100 -@@ -7,23 +7,22 @@ - - ################################################################ - --INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib -+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC) - DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \ - -DG_ENABLE_DEBUG - # -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS - # -DG_DISABLE_CAST_CHECKS - - all : \ - glib-genmarshal.exe \ - gmarshal.h \ -- gmarshal.c \ - gmarshal.strings \ -- gobject-query.exe \ -- libgobject-2.0-0.dll \ -+ gobjectlo.dll \ - gobject-2.28s.lib \ -- testgobject.exe - - gobject_OBJECTS = \ -+ gatomicarray.obj \ -+ gbinding.obj \ - gboxed.obj \ - gclosure.obj \ - genums.obj \ -@@ -47,21 +49,18 @@ - -DG_GNUC_PRINTF=;G_GNUC_PRINTF gobject.symbols >> gobject.def - - gobject.res : gobject.rc -- rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc -+ rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gobject.res gobject.rc - - gmarshal.h : gmarshal.list glib-genmarshal.exe - echo #ifndef __G_MARSHAL_H__ > xgen-gmh - echo #define __G_MARSHAL_H__ >> xgen-gmh - glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --header >> xgen-gmh - echo #endif /* __G_MARSHAL_H__ */ >> xgen-gmh -- copy xgen-gmh gmarshal.h -- --gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe -- glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c -+ cp xgen-gmh gmarshal.h - --libgobject-2.0-0.dll : $(gobject_OBJECTS) gobject.def gobject.res -+gobjectlo.dll : $(gobject_OBJECTS) gobject.def gobject.res - $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \ -- ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || del $@ -+ ..\glib\glib-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def || rm $@ - - gobject-2.28s.lib : $(gobject_OBJECTS) - lib /out:$@ $(gobject_OBJECTS) ---- misc/glib-2.28.1/gthread/makefile.msc 2011-02-18 16:35:00.000000000 +0100 -+++ misc/build/glib-2.28.1/gthread/makefile.msc 2011-03-04 08:43:06.900355800 +0100 -@@ -7,10 +7,10 @@ - - ################################################################ - --INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib -+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib $(SOLARINC) - DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" - all : \ -- libgthread-2.0-0.dll -+ gthreadlo.dll - - gthread_OBJECTS = \ - gthread-impl.obj -@@ -19,8 +19,8 @@ - $(CC) -c $(CFLAGS) gthread-impl.c - - gthread.res : gthread.rc -- rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc -+ rc -DBUILDNUMBER=0 -r -i $(SOLARINC) -fo gthread.res gthread.rc - --libgthread-2.0-0.dll : $(gthread_OBJECTS) gthread.def gthread.res -+gthreadlo.dll : $(gthread_OBJECTS) gthread.def gthread.res - $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \ - ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def ---- misc/glib-2.28.1/makefile.msc 2009-04-01 01:04:20.000000000 +0200 -+++ misc/build/glib-2.28.1/makefile.msc 2011-03-04 09:11:06.663432800 +0100 -@@ -1,7 +1,7 @@ - ## Makefile for building the GLib dlls with Microsoft C - ## Use: nmake -f makefile.msc - --PARTS = glib gmodule gthread gobject gio tests -+PARTS = "build\win32\dirent" glib gmodule gthread gobject gio tests - - all : \ - config.h \ -@@ -22,7 +22,7 @@ - @cd .. - - config.h: config.h.win32 -- copy config.h.win32 config.h -+ cp config.h.win32 config.h - --glibconfig.h: glibconfig.h.win32 -- copy glibconfig.h.win32 glibconfig.h -+glibconfig.h: glib/glibconfig.h.win32 -+ cp glib/glibconfig.h.win32 glib/glibconfig.h ---- misc/glib-2.28.1/tests/makefile.msc 2011-02-18 16:35:43.000000000 +0100 -+++ misc/build/glib-2.28.1/tests/makefile.msc 2011-03-04 08:33:02.079762100 +0100 -@@ -7,7 +7,7 @@ - - ################################################################ - --INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule -+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I ..\glib -I ..\gmodule $(SOLARINC) - DEFINES = -DHAVE_CONFIG_H -DENABLE_REGEX - - NONAUTOMATIC_TESTS = \ -@@ -79,7 +79,7 @@ - libmoduletestplugin_a.dll \ - libmoduletestplugin_b.dll - --all : $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS) -+all : - - .c.exe : - $(CC) $(CFLAGS) -c $< ---- misc/glib-2.28.1/glib/glibconfig.h Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/glib/glibconfig.h Wed Aug 20 14:26:42 2008 -@@ -1 +1,285 @@ --dummy -+/* glibconfig.h.win32.in. Originally merged from two versions of -+ * glibconfig.h, generated by the GLib configure script, for gcc and -+ * MSVC. -+ */ -+ -+/* glibconfig.h -+ * -+ * This is a generated file. Please modify 'glibconfig.h.win32.in' -+ */ -+ -+#ifndef __G_LIBCONFIG_H__ -+#define __G_LIBCONFIG_H__ -+ -+#include <glib/gmacros.h> -+ -+#include <limits.h> -+#include <float.h> -+ -+G_BEGIN_DECLS -+ -+#define G_MINFLOAT FLT_MIN -+#define G_MAXFLOAT FLT_MAX -+#define G_MINDOUBLE DBL_MIN -+#define G_MAXDOUBLE DBL_MAX -+#define G_MINSHORT SHRT_MIN -+#define G_MAXSHORT SHRT_MAX -+#define G_MAXUSHORT USHRT_MAX -+#define G_MININT INT_MIN -+#define G_MAXINT INT_MAX -+#define G_MAXUINT UINT_MAX -+#define G_MINLONG LONG_MIN -+#define G_MAXLONG LONG_MAX -+#define G_MAXULONG ULONG_MAX -+ -+typedef signed char gint8; -+typedef unsigned char guint8; -+typedef signed short gint16; -+typedef unsigned short guint16; -+#define G_GINT16_MODIFIER "h" -+#define G_GINT16_FORMAT "hi" -+#define G_GUINT16_FORMAT "hu" -+typedef signed int gint32; -+typedef unsigned int guint32; -+#define G_GINT32_MODIFIER "" -+#define G_GINT32_FORMAT "i" -+#define G_GUINT32_FORMAT "u" -+#define G_HAVE_GINT64 1 /* deprecated, always true */ -+ -+#ifndef _MSC_VER -+G_GNUC_EXTENSION typedef signed long long gint64; -+G_GNUC_EXTENSION typedef unsigned long long guint64; -+#else /* _MSC_VER */ -+typedef signed __int64 gint64; -+typedef unsigned __int64 guint64; -+#endif /* _MSC_VER */ -+ -+#ifndef _MSC_VER -+#define G_GINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##LL)) -+#else /* _MSC_VER */ -+#define G_GINT64_CONSTANT(val) (val##i64) -+#endif /* _MSC_VER */ -+#ifndef _MSC_VER -+#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) -+#else /* _MSC_VER */ -+#define G_GUINT64_CONSTANT(val) (val##Ui64) -+#endif /* _MSC_VER */ -+#define G_GINT64_MODIFIER "I64" -+#define G_GINT64_FORMAT "I64i" -+#define G_GUINT64_FORMAT "I64u" -+ -+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64) -+ -+#define GLIB_SIZEOF_VOID_P 8 -+#define GLIB_SIZEOF_LONG 4 -+#define GLIB_SIZEOF_SIZE_T 8 -+ -+typedef signed long long gssize; -+typedef unsigned long long gsize; -+#define G_GSIZE_MODIFIER "I64" -+#define G_GSSIZE_FORMAT "I64d" -+#define G_GSIZE_FORMAT "I64u" -+ -+#define G_MAXSIZE G_MAXUINT64 -+#define G_MINSSIZE G_MININT64 -+#define G_MAXSSIZE G_MAXINT64 -+ -+#else -+ -+#define GLIB_SIZEOF_VOID_P 4 -+#define GLIB_SIZEOF_LONG 4 -+#define GLIB_SIZEOF_SIZE_T 4 -+ -+typedef signed int gssize; -+typedef unsigned int gsize; -+#define G_GSIZE_MODIFIER "" -+#define G_GSSIZE_FORMAT "i" -+#define G_GSIZE_FORMAT "u" -+ -+#define G_MAXSIZE G_MAXUINT -+#define G_MINSSIZE G_MININT -+#define G_MAXSSIZE G_MAXINT -+ -+#endif -+ -+typedef gint64 goffset; -+#define G_MINOFFSET G_MININT64 -+#define G_MAXOFFSET G_MAXINT64 -+ -+#define G_GOFFSET_MODIFIER G_GINT64_MODIFIER -+#define G_GOFFSET_FORMAT G_GINT64_FORMAT -+#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) -+ -+ -+#ifndef _WIN64 -+ -+#define GPOINTER_TO_INT(p) ((gint) (p)) -+#define GPOINTER_TO_UINT(p) ((guint) (p)) -+ -+#define GINT_TO_POINTER(i) ((gpointer) (i)) -+#define GUINT_TO_POINTER(u) ((gpointer) (u)) -+ -+typedef signed int gintptr; -+typedef unsigned int guintptr; -+ -+#define G_GINTPTR_MODIFIER "" -+#define G_GINTPTR_FORMAT "i" -+#define G_GUINTPTR_FORMAT "u" -+ -+#else -+ -+#define GPOINTER_TO_INT(p) ((gint) (gint64) (p)) -+#define GPOINTER_TO_UINT(p) ((guint) (guint64) (p)) -+ -+#define GINT_TO_POINTER(i) ((gpointer) (gint64) (i)) -+#define GUINT_TO_POINTER(u) ((gpointer) (guint64) (u)) -+ -+#ifndef _MSC_VER -+typedef signed long long gintptr; -+typedef unsigned long long guintptr; -+#else -+typedef signed __int64 gintptr; -+typedef unsigned __int64 guintptr; -+#endif -+ -+#define G_GINTPTR_MODIFIER "I64" -+#define G_GINTPTR_FORMAT "I64i" -+#define G_GUINTPTR_FORMAT "I64u" -+ -+#endif -+ -+#ifdef NeXT /* @#%@! NeXTStep */ -+# define g_ATEXIT(proc) (!atexit (proc)) -+#else -+# define g_ATEXIT(proc) (atexit (proc)) -+#endif -+ -+#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END -+ -+#define GLIB_MAJOR_VERSION 2 -+#define GLIB_MINOR_VERSION 28 -+#define GLIB_MICRO_VERSION 1 -+ -+#define G_OS_WIN32 -+#define G_PLATFORM_WIN32 -+ -+ -+#ifndef _MSC_VER -+#define G_VA_COPY va_copy -+#endif /* not _MSC_VER */ -+ -+#ifdef __cplusplus -+#define G_HAVE_INLINE 1 -+#else /* !__cplusplus */ -+#ifndef _MSC_VER -+#define G_HAVE_INLINE 1 -+#endif /* _MSC_VER */ -+#define G_HAVE___INLINE 1 -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define G_HAVE___INLINE__ 1 -+#endif /* !_MSC_VER and !__DMC__ */ -+#endif /* !__cplusplus */ -+ -+#define G_CAN_INLINE 1 -+ -+#ifndef _MSC_VER -+#define G_HAVE_ISO_VARARGS 1 -+ -+/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi -+ * is passed ISO vararg support is turned off, and there is no work -+ * around to turn it on, so we unconditionally turn it off. -+ */ -+#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 -+# undef G_HAVE_ISO_VARARGS -+#endif -+ -+#define G_HAVE_GNUC_VARARGS 1 -+#else /* _MSC_VER */ -+/* varargs macros available since msvc8 (vs2005) */ -+# if _MSC_VER >= 1400 -+# define G_HAVE_ISO_VARARGS 1 -+# endif -+#endif /* not _MSC_VER */ -+#define G_HAVE_GROWING_STACK 0 -+ -+#define G_GNUC_INTERNAL -+ -+#define G_THREADS_ENABLED -+#define G_THREADS_IMPL_WIN32 -+typedef struct _GMutex* GStaticMutex; -+#define G_STATIC_MUTEX_INIT NULL -+#define g_static_mutex_get_mutex(mutex) \ -+ (g_static_mutex_get_mutex_impl_shortcut (mutex)) -+/* This represents a system thread as used by the implementation. An -+ * alien implementaion, as loaded by g_thread_init can only count on -+ * "sizeof (gpointer)" bytes to store their info. We however need more -+ * for some of our native implementations. */ -+typedef union _GSystemThread GSystemThread; -+union _GSystemThread -+{ -+#ifndef _WIN64 -+ char data[4]; -+#else -+ char data[8]; -+#endif -+ double dummy_double; -+ void *dummy_pointer; -+ long dummy_long; -+}; -+ -+#define GINT16_TO_LE(val) ((gint16) (val)) -+#define GUINT16_TO_LE(val) ((guint16) (val)) -+#define GINT16_TO_BE(val) ((gint16) GUINT16_SWAP_LE_BE (val)) -+#define GUINT16_TO_BE(val) (GUINT16_SWAP_LE_BE (val)) -+#define GINT32_TO_LE(val) ((gint32) (val)) -+#define GUINT32_TO_LE(val) ((guint32) (val)) -+#define GINT32_TO_BE(val) ((gint32) GUINT32_SWAP_LE_BE (val)) -+#define GUINT32_TO_BE(val) (GUINT32_SWAP_LE_BE (val)) -+#define GINT64_TO_LE(val) ((gint64) (val)) -+#define GUINT64_TO_LE(val) ((guint64) (val)) -+#define GINT64_TO_BE(val) ((gint64) GUINT64_SWAP_LE_BE (val)) -+#define GUINT64_TO_BE(val) (GUINT64_SWAP_LE_BE (val)) -+#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val)) -+#define GULONG_TO_LE(val) ((gulong) GUINT32_TO_LE (val)) -+#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val)) -+#define GULONG_TO_BE(val) ((gulong) GUINT32_TO_BE (val)) -+#define GINT_TO_LE(val) ((gint) GINT32_TO_LE (val)) -+#define GUINT_TO_LE(val) ((guint) GUINT32_TO_LE (val)) -+#define GINT_TO_BE(val) ((gint) GINT32_TO_BE (val)) -+#define GUINT_TO_BE(val) ((guint) GUINT32_TO_BE (val)) -+#define GSIZE_TO_LE(val) ((gsize) GUINT32_TO_LE (val)) -+#define GSSIZE_TO_LE(val) ((gssize) GINT32_TO_LE (val)) -+#define GSIZE_TO_BE(val) ((gsize) GUINT32_TO_BE (val)) -+#define GSSIZE_TO_BE(val) ((gssize) GINT32_TO_BE (val)) -+#define G_BYTE_ORDER G_LITTLE_ENDIAN -+ -+#define GLIB_SYSDEF_POLLIN =1 -+#define GLIB_SYSDEF_POLLOUT =4 -+#define GLIB_SYSDEF_POLLPRI =2 -+#define GLIB_SYSDEF_POLLHUP =16 -+#define GLIB_SYSDEF_POLLERR =8 -+#define GLIB_SYSDEF_POLLNVAL =32 -+ -+#define G_MODULE_SUFFIX "dll" -+ -+/* A GPid is an abstraction for a process "handle". It is *not* an -+ * abstraction for a process identifier in general. GPid is used in -+ * GLib only for descendant processes spawned with the g_spawn* -+ * functions. On POSIX there is no "process handle" concept as such, -+ * but on Windows a GPid is a handle to a process, a kind of pointer, -+ * not a process identifier. -+ */ -+typedef void * GPid; -+ -+#define GLIB_SYSDEF_AF_UNIX 1 -+#define GLIB_SYSDEF_AF_INET 2 -+#define GLIB_SYSDEF_AF_INET6 23 -+ -+#define GLIB_SYSDEF_MSG_OOB 1 -+#define GLIB_SYSDEF_MSG_PEEK 2 -+#define GLIB_SYSDEF_MSG_DONTROUTE 4 -+ -+G_END_DECLS -+ -+#endif /* GLIBCONFIG_H */ -+ ---- misc/glib-2.28.1/gmodule/gmoduleconf.h Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/gmodule/gmoduleconf.h Wed Aug 20 14:26:42 2008 -@@ -1 +1,45 @@ --dummy -+/* GMODULE - GLIB wrapper code for dynamic module loading -+ * Copyright (C) 1998 Tim Janik -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+#ifndef __G_MODULE_CONF_H__ -+#define __G_MODULE_CONF_H__ -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif /* __cplusplus */ -+ -+ -+#define G_MODULE_IMPL_NONE 0 -+#define G_MODULE_IMPL_DL 1 -+#define G_MODULE_IMPL_DLD 2 -+#define G_MODULE_IMPL_WIN32 3 -+#define G_MODULE_IMPL_OS2 4 -+#define G_MODULE_IMPL_BEOS 5 -+#define G_MODULE_IMPL_DYLD 6 -+ -+#define G_MODULE_IMPL G_MODULE_IMPL_WIN32 -+#undef G_MODULE_HAVE_DLERROR -+ -+#ifdef __cplusplus -+} -+#endif /* __cplusplus */ -+ -+ -+#endif /* __G_MODULE_CONF_H__ */ -+ ---- misc/glib-2.28.1/config.h Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/config.h Wed Aug 20 14:26:42 2008 -@@ -1 +1,834 @@ --dummy -+/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ -+/* config.h. Generated by configure. */ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define if building universal (internal helper macro) */ -+/* #undef AC_APPLE_UNIVERSAL_BUILD */ -+ -+/* define if asm blocks can use numeric local labels */ -+/* #undef ASM_NUMERIC_LABELS */ -+ -+/* poll doesn't work on devices */ -+#define BROKEN_POLL 1 -+ -+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP -+ systems. This function is required for `alloca.c' support on those systems. -+ */ -+/* #undef CRAY_STACKSEG_END */ -+ -+/* Define to 1 if using `alloca.c'. */ -+/* #undef C_ALLOCA */ -+ -+/* Whether to disable memory pools */ -+/* #undef DISABLE_MEM_POOLS */ -+ -+/* Whether to enable GC friendliness by default */ -+/* #undef ENABLE_GC_FRIENDLY_DEFAULT */ -+ -+/* always defined to indicate that i18n is enabled */ -+#define ENABLE_NLS 1 -+ -+/* include GRegex */ -+#define ENABLE_REGEX /**/ -+ -+/* Define the gettext package to be used */ -+#define GETTEXT_PACKAGE "glib20" -+ -+/* Define to the GLIB binary age */ -+#define GLIB_BINARY_AGE 2801 -+ -+/* Byte contents of gmutex */ -+/* #undef GLIB_BYTE_CONTENTS_GMUTEX */ -+ -+/* Define to the GLIB interface age */ -+#define GLIB_INTERFACE_AGE 1 -+ -+/* Define the location where the catalogs will be installed */ -+#define GLIB_LOCALE_DIR "NONE/share/locale" -+ -+/* Define to the GLIB major version */ -+#define GLIB_MAJOR_VERSION 2 -+ -+/* Define to the GLIB micro version */ -+#define GLIB_MICRO_VERSION 1 -+ -+/* Define to the GLIB minor version */ -+#define GLIB_MINOR_VERSION 28 -+ -+/* The size of gmutex, as computed by sizeof. */ -+/* #undef GLIB_SIZEOF_GMUTEX */ -+ -+/* The size of system_thread, as computed by sizeof. */ -+#define GLIB_SIZEOF_SYSTEM_THREAD 4 -+ -+/* alpha atomic implementation */ -+/* #undef G_ATOMIC_ALPHA */ -+ -+/* arm atomic implementation */ -+/* #undef G_ATOMIC_ARM */ -+ -+/* cris atomic implementation */ -+/* #undef G_ATOMIC_CRIS */ -+ -+/* crisv32 atomic implementation */ -+/* #undef G_ATOMIC_CRISV32 */ -+ -+/* i486 atomic implementation */ -+#ifndef _MSC_VER -+#define G_ATOMIC_I486 1 -+#endif /* _MSC_VER */ -+ -+/* ia64 atomic implementation */ -+/* #undef G_ATOMIC_IA64 */ -+ -+/* powerpc atomic implementation */ -+/* #undef G_ATOMIC_POWERPC */ -+ -+/* s390 atomic implementation */ -+/* #undef G_ATOMIC_S390 */ -+ -+/* sparcv9 atomic implementation */ -+/* #undef G_ATOMIC_SPARCV9 */ -+ -+/* x86_64 atomic implementation */ -+/* #undef G_ATOMIC_X86_64 */ -+ -+/* Have inline keyword */ -+#ifndef _MSC_VER -+#define G_HAVE_INLINE 1 -+#else /* _MSC_VER */ -+/* #undef G_HAVE_INLINE */ -+#endif /* _MSC_VER */ -+ -+/* Have __inline keyword */ -+#define G_HAVE___INLINE 1 -+ -+/* Have __inline__ keyword */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define G_HAVE___INLINE__ 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef G_HAVE___INLINE__ */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Source file containing theread implementation */ -+#define G_THREAD_SOURCE "gthread-win32.c" -+ -+/* A 'va_copy' style function */ -+#ifndef _MSC_VER -+#define G_VA_COPY va_copy -+#else /* _MSC_VER */ -+/* #undef G_VA_COPY */ -+#endif /* _MSC_VER */ -+ -+/* 'va_lists' cannot be copies as values */ -+/* #undef G_VA_COPY_AS_ARRAY */ -+ -+/* Define to 1 if you have `alloca', as a function or macro. */ -+#define HAVE_ALLOCA 1 -+ -+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). -+ */ -+/* #undef HAVE_ALLOCA_H */ -+ -+/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */ -+/* #undef HAVE_ARPA_NAMESER_COMPAT_H */ -+ -+/* Define to 1 if you have the `atexit' function. */ -+#define HAVE_ATEXIT 1 -+ -+/* Define to 1 if you have the <attr/xattr.h> header file. */ -+/* #undef HAVE_ATTR_XATTR_H */ -+ -+/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -+#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -+ -+/* Define if you have a version of the snprintf function with semantics as -+ specified by the ISO C99 standard. */ -+/* #undef HAVE_C99_SNPRINTF */ -+ -+/* Define if you have a version of the vsnprintf function with semantics as -+ specified by the ISO C99 standard. */ -+/* #undef HAVE_C99_VSNPRINTF */ -+ -+/* define to 1 if Carbon is available */ -+/* #undef HAVE_CARBON */ -+ -+/* Define to 1 if you have the `chown' function. */ -+/* #undef HAVE_CHOWN */ -+ -+/* Define to 1 if you have the `clock_gettime' function. */ -+/* #undef HAVE_CLOCK_GETTIME */ -+ -+/* Have nl_langinfo (CODESET) */ -+/* #undef HAVE_CODESET */ -+ -+/* Define to 1 if you have the <crt_externs.h> header file. */ -+/* #undef HAVE_CRT_EXTERNS_H */ -+ -+/* Define if dbus-1 is available */ -+/* #undef HAVE_DBUS1 */ -+ -+/* Define to 1 if you have the `dcgettext' function. */ -+#define HAVE_DCGETTEXT 1 -+ -+/* Define to 1 if you have the <dirent.h> header file. */ -+#ifndef _MSC_VER -+#define HAVE_DIRENT_H 1 -+#else -+/* #undef HAVE_DIRENT_H */ -+#endif -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+/* #undef HAVE_DLFCN_H */ -+ -+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -+/* #undef HAVE_DOPRNT */ -+ -+/* define for working do while(0) macros */ -+#define HAVE_DOWHILE_MACROS 1 -+ -+/* Define to 1 if you have the `endmntent' function. */ -+/* #undef HAVE_ENDMNTENT */ -+ -+/* Define to 1 if you have the `endservent' function. */ -+/* #undef HAVE_ENDSERVENT */ -+ -+/* Define if we have FAM */ -+/* #undef HAVE_FAM */ -+ -+/* Define to 1 if you have the <fam.h> header file. */ -+/* #undef HAVE_FAM_H */ -+ -+/* Define if we have FAMNoExists in fam */ -+/* #undef HAVE_FAM_NO_EXISTS */ -+ -+/* Define to 1 if you have the `fchmod' function. */ -+/* #undef HAVE_FCHMOD */ -+ -+/* Define to 1 if you have the `fchown' function. */ -+/* #undef HAVE_FCHOWN */ -+ -+/* Define to 1 if you have the `fdwalk' function. */ -+/* #undef HAVE_FDWALK */ -+ -+/* Define to 1 if you have the <float.h> header file. */ -+#define HAVE_FLOAT_H 1 -+ -+/* Define to 1 if you have the <fstab.h> header file. */ -+/* #undef HAVE_FSTAB_H */ -+ -+/* Define to 1 if you have the `fsync' function. */ -+/* #undef HAVE_FSYNC */ -+ -+/* we have the futex(2) system call */ -+/* #undef HAVE_FUTEX */ -+ -+/* Define to 1 if you have the `getcwd' function. */ -+#define HAVE_GETCWD 1 -+ -+/* Define to 1 if you have the `getc_unlocked' function. */ -+/* #undef HAVE_GETC_UNLOCKED */ -+ -+/* Define to 1 if you have the `getgrgid' function. */ -+/* #undef HAVE_GETGRGID */ -+ -+/* Define to 1 if you have the `getmntent_r' function. */ -+/* #undef HAVE_GETMNTENT_R */ -+ -+/* Define to 1 if you have the `getmntinfo' function. */ -+/* #undef HAVE_GETMNTINFO */ -+ -+/* Define to 1 if you have the `getprotobyname_r' function. */ -+/* #undef HAVE_GETPROTOBYNAME_R */ -+ -+/* Define to 1 if you have the `getpwuid' function. */ -+/* #undef HAVE_GETPWUID */ -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#define HAVE_GETTEXT 1 -+ -+/* Define to 1 if you have the `gmtime_r' function. */ -+/* #undef HAVE_GMTIME_R */ -+ -+/* define to use system printf */ -+/* #undef HAVE_GOOD_PRINTF */ -+ -+/* Define to 1 if you have the <grp.h> header file. */ -+/* #undef HAVE_GRP_H */ -+ -+/* Define to 1 if you have the `hasmntopt' function. */ -+/* #undef HAVE_HASMNTOPT */ -+ -+/* Define to 1 if you have the `inotify_init1' function. */ -+/* #undef HAVE_INOTIFY_INIT1 */ -+ -+/* define to support printing 64-bit integers with format I64 */ -+#define HAVE_INT64_AND_I64 1 -+ -+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */ -+#ifndef _MSC_VER -+#define HAVE_INTMAX_T 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTMAX_T */ -+#endif /* _MSC_VER */ -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#ifndef _MSC_VER -+#define HAVE_INTTYPES_H 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTTYPES_H */ -+#endif /* _MSC_VER */ -+ -+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and -+ declares uintmax_t. */ -+#ifndef _MSC_VER -+#define HAVE_INTTYPES_H_WITH_UINTMAX 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */ -+#endif /* _MSC_VER */ -+ -+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ -+/* #undef HAVE_LANGINFO_CODESET */ -+ -+/* Define to 1 if you have the `lchmod' function. */ -+/* #undef HAVE_LCHMOD */ -+ -+/* Define to 1 if you have the `lchown' function. */ -+/* #undef HAVE_LCHOWN */ -+ -+/* Define if your <locale.h> file defines LC_MESSAGES. */ -+/* #undef HAVE_LC_MESSAGES */ -+ -+/* Define to 1 if you have the <limits.h> header file. */ -+#define HAVE_LIMITS_H 1 -+ -+/* Define to 1 if you have the `link' function. */ -+/* #undef HAVE_LINK */ -+ -+/* Define to 1 if you have the <locale.h> header file. */ -+#define HAVE_LOCALE_H 1 -+ -+/* Define to 1 if you have the `localtime_r' function. */ -+/* #undef HAVE_LOCALTIME_R */ -+ -+/* Define if you have the 'long double' type. */ -+#define HAVE_LONG_DOUBLE 1 -+ -+/* Define if you have the 'long long' type. */ -+#ifndef _MSC_VER -+#define HAVE_LONG_LONG 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_LONG_LONG */ -+#endif /* _MSC_VER */ -+ -+/* define if system printf can print long long */ -+#define HAVE_LONG_LONG_FORMAT 1 -+ -+/* Define to 1 if you have the `lstat' function. */ -+/* #undef HAVE_LSTAT */ -+ -+/* Define to 1 if you have the <malloc.h> header file. */ -+#define HAVE_MALLOC_H 1 -+ -+/* Define to 1 if you have the `memalign' function. */ -+/* #undef HAVE_MEMALIGN */ -+ -+/* Define to 1 if you have the `memmem' function. */ -+/* #undef HAVE_MEMMEM */ -+ -+/* Define to 1 if you have the `memmove' function. */ -+#define HAVE_MEMMOVE 1 -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the `mmap' function. */ -+/* #undef HAVE_MMAP */ -+ -+/* Define to 1 if you have the <mntent.h> header file. */ -+/* #undef HAVE_MNTENT_H */ -+ -+/* Have a monotonic clock */ -+/* #undef HAVE_MONOTONIC_CLOCK */ -+ -+/* Define to 1 if you have the `nanosleep' function. */ -+/* #undef HAVE_NANOSLEEP */ -+ -+/* Define to 1 if you have the <netdb.h> header file. */ -+/* #undef HAVE_NETDB_H */ -+ -+/* Have non-POSIX function getgrgid_r */ -+/* #undef HAVE_NONPOSIX_GETGRGID_R */ -+ -+/* Have non-POSIX function getpwuid_r */ -+/* #undef HAVE_NONPOSIX_GETPWUID_R */ -+ -+/* Define to 1 if you have the `nsleep' function. */ -+/* #undef HAVE_NSLEEP */ -+ -+/* Define to 1 if you have the `on_exit' function. */ -+/* #undef HAVE_ON_EXIT */ -+ -+/* Define to 1 if you have the `pipe2' function. */ -+/* #undef HAVE_PIPE2 */ -+ -+/* Define to 1 if you have the `poll' function. */ -+/* #undef HAVE_POLL */ -+ -+/* Have POSIX function getgrgid_r */ -+/* #undef HAVE_POSIX_GETGRGID_R */ -+ -+/* Have POSIX function getpwuid_r */ -+/* #undef HAVE_POSIX_GETPWUID_R */ -+ -+/* Define to 1 if you have the `posix_memalign' function. */ -+/* #undef HAVE_POSIX_MEMALIGN */ -+ -+/* Have function pthread_attr_setstacksize */ -+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ -+ -+/* Define to 1 if the system has the type `ptrdiff_t'. */ -+#define HAVE_PTRDIFF_T 1 -+ -+/* Define to 1 if you have the <pwd.h> header file. */ -+/* #undef HAVE_PWD_H */ -+ -+/* Define to 1 if you have the `readlink' function. */ -+/* #undef HAVE_READLINK */ -+ -+/* Define to 1 if you have the <sched.h> header file. */ -+/* #undef HAVE_SCHED_H */ -+ -+/* Define to 1 if libselinux is available */ -+/* #undef HAVE_SELINUX */ -+ -+/* Define to 1 if you have the <selinux/selinux.h> header file. */ -+/* #undef HAVE_SELINUX_SELINUX_H */ -+ -+/* Define to 1 if you have the `setenv' function. */ -+/* #undef HAVE_SETENV */ -+ -+/* Define to 1 if you have the `setlocale' function. */ -+#define HAVE_SETLOCALE 1 -+ -+/* Define to 1 if you have the `setmntent' function. */ -+/* #undef HAVE_SETMNTENT */ -+ -+/* Define to 1 if you have the `setresuid' function. */ -+/* #undef HAVE_SETRESUID */ -+ -+/* Define to 1 if you have the `setreuid' function. */ -+/* #undef HAVE_SETREUID */ -+ -+/* Define to 1 if you have the `snprintf' function. */ -+#ifndef _MSC_VER -+#define HAVE_SNPRINTF 1 -+#ifdef __DMC__ -+#define snprintf _snprintf -+#endif -+#else /* _MSC_VER */ -+/* #undef HAVE_SNPRINTF */ -+#endif /* _MSC_VER */ -+ -+/* Define to 1 if you have the `splice' function. */ -+/* #undef HAVE_SPLICE */ -+ -+/* Define to 1 if you have the `statfs' function. */ -+/* #undef HAVE_STATFS */ -+ -+/* Define to 1 if you have the `statvfs' function. */ -+/* #undef HAVE_STATVFS */ -+ -+/* Define to 1 if you have the <stddef.h> header file. */ -+#define HAVE_STDDEF_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#ifndef _MSC_VER -+#define HAVE_STDINT_H 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_STDINT_H */ -+#endif /* _MSC_VER */ -+ -+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares -+ uintmax_t. */ -+#ifndef _MSC_VER -+#define HAVE_STDINT_H_WITH_UINTMAX 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_STDINT_H_WITH_UINTMAX */ -+#endif /* _MSC_VER */ -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the `stpcpy' function. */ -+/* #undef HAVE_STPCPY */ -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define HAVE_STRCASECMP 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef HAVE_STRCASECMP */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Define to 1 if you have the `strerror' function. */ -+#define HAVE_STRERROR 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define HAVE_STRINGS_H 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef HAVE_STRINGS_H */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Have functions strlcpy and strlcat */ -+/* #undef HAVE_STRLCPY */ -+ -+/* Define to 1 if you have the `strncasecmp' function. */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define HAVE_STRNCASECMP 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef HAVE_STRNCASECMP */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Define to 1 if you have the `strndup' function. */ -+/* #undef HAVE_STRNDUP */ -+ -+/* Define to 1 if you have the `strsignal' function. */ -+/* #undef HAVE_STRSIGNAL */ -+ -+/* Define to 1 if `f_bavail' is member of `struct statfs'. */ -+/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ -+ -+/* Define to 1 if `f_fstypename' is member of `struct statfs'. */ -+/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ -+ -+/* Define to 1 if `f_basetype' is member of `struct statvfs'. */ -+/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ -+ -+/* Define to 1 if `st_atimensec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ -+ -+/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ -+ -+/* Define to 1 if `st_blksize' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ -+ -+/* Define to 1 if `st_blocks' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ -+ -+/* Define to 1 if `st_ctimensec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */ -+ -+/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */ -+ -+/* Define to 1 if `st_mtimensec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */ -+ -+/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */ -+/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */ -+ -+/* Define to 1 if you have the `symlink' function. */ -+/* #undef HAVE_SYMLINK */ -+ -+/* Define to 1 if you have the <sys/inotify.h> header file. */ -+/* #undef HAVE_SYS_INOTIFY_H */ -+ -+/* Define to 1 if you have the <sys/mntctl.h> header file. */ -+/* #undef HAVE_SYS_MNTCTL_H */ -+ -+/* Define to 1 if you have the <sys/mnttab.h> header file. */ -+/* #undef HAVE_SYS_MNTTAB_H */ -+ -+/* Define to 1 if you have the <sys/mount.h> header file. */ -+/* #undef HAVE_SYS_MOUNT_H */ -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define HAVE_SYS_PARAM_H 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef HAVE_SYS_PARAM_H */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Define to 1 if you have the <sys/poll.h> header file. */ -+/* #undef HAVE_SYS_POLL_H */ -+ -+/* Define to 1 if you have the <sys/prctl.h> header file. */ -+/* #undef HAVE_SYS_PRCTL_H */ -+ -+/* Define to 1 if you have the <sys/resource.h> header file. */ -+/* #undef HAVE_SYS_RESOURCE_H */ -+ -+/* found fd_set in sys/select.h */ -+/* #undef HAVE_SYS_SELECT_H */ -+ -+/* Define to 1 if you have the <sys/statfs.h> header file. */ -+/* #undef HAVE_SYS_STATFS_H */ -+ -+/* Define to 1 if you have the <sys/statvfs.h> header file. */ -+/* #undef HAVE_SYS_STATVFS_H */ -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/sysctl.h> header file. */ -+/* #undef HAVE_SYS_SYSCTL_H */ -+ -+/* Define to 1 if you have the <sys/times.h> header file. */ -+/* #undef HAVE_SYS_TIMES_H */ -+ -+/* Define to 1 if you have the <sys/time.h> header file. */ -+#ifndef _MSC_VER -+#define HAVE_SYS_TIME_H 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_SYS_TIME_H */ -+#endif /* _MSC_VER */ -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <sys/uio.h> header file. */ -+/* #undef HAVE_SYS_UIO_H */ -+ -+/* Define to 1 if you have the <sys/vfstab.h> header file. */ -+/* #undef HAVE_SYS_VFSTAB_H */ -+ -+/* Define to 1 if you have the <sys/vfs.h> header file. */ -+/* #undef HAVE_SYS_VFS_H */ -+ -+/* Define to 1 if you have the <sys/vmount.h> header file. */ -+/* #undef HAVE_SYS_VMOUNT_H */ -+ -+/* Define to 1 if you have the <sys/wait.h> header file. */ -+/* #undef HAVE_SYS_WAIT_H */ -+ -+/* Define to 1 if you have the <sys/xattr.h> header file. */ -+/* #undef HAVE_SYS_XATTR_H */ -+ -+/* Define to 1 if you have the `timegm' function. */ -+/* #undef HAVE_TIMEGM */ -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#ifndef _MSC_VER -+#define HAVE_UNISTD_H 1 -+#else /* _MSC_VER */ -+/* #undef HAVE_UNISTD_H */ -+#endif /* _MSC_VER */ -+ -+/* Define if your printf function family supports positional parameters as -+ specified by Unix98. */ -+/* #undef HAVE_UNIX98_PRINTF */ -+ -+/* Define to 1 if you have the `unsetenv' function. */ -+/* #undef HAVE_UNSETENV */ -+ -+/* Define to 1 if you have the `utimes' function. */ -+/* #undef HAVE_UTIMES */ -+ -+/* Define to 1 if you have the `valloc' function. */ -+/* #undef HAVE_VALLOC */ -+ -+/* Define to 1 if you have the <values.h> header file. */ -+#if !defined(_MSC_VER) && !defined(__DMC__) -+#define HAVE_VALUES_H 1 -+#else /* _MSC_VER or __DMC__ */ -+/* #undef HAVE_VALUES_H */ -+#endif /* _MSC_VER or __DMC__ */ -+ -+/* Define to 1 if you have the `vasprintf' function. */ -+#define HAVE_VASPRINTF 1 -+ -+/* Define to 1 if you have the `vprintf' function. */ -+#define HAVE_VPRINTF 1 -+ -+/* Define to 1 if you have the `vsnprintf' function. */ -+#ifndef _MSC_VER -+#define HAVE_VSNPRINTF 1 -+#ifdef __DMC__ -+#define vsnprintf _vsnprintf -+#endif -+#else /* _MSC_VER */ -+/* #undef HAVE_VSNPRINTF */ -+#endif /* _MSC_VER */ -+ -+/* Define if you have the 'wchar_t' type. */ -+#define HAVE_WCHAR_T 1 -+ -+/* Define to 1 if you have the `wcslen' function. */ -+#define HAVE_WCSLEN 1 -+ -+/* Define if you have the 'wint_t' type. */ -+#define HAVE_WINT_T 1 -+ -+/* Have a working bcopy */ -+/* #undef HAVE_WORKING_BCOPY */ -+ -+/* Define to 1 if you have the <wspiapi.h> header file. */ -+#ifndef _MSC_VER -+/* #undef HAVE_WSPIAPI_H */ -+#else -+#define HAVE_WSPIAPI_H 1 -+#endif -+ -+/* Define to 1 if xattr is available */ -+/* #undef HAVE_XATTR */ -+ -+/* Define to 1 if xattr API uses XATTR_NOFOLLOW */ -+/* #undef HAVE_XATTR_NOFOLLOW */ -+ -+/* Define to 1 if you have the `_NSGetEnviron' function. */ -+/* #undef HAVE__NSGETENVIRON */ -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#define LT_OBJDIR ".libs/" -+ -+/* Do we cache iconv descriptors */ -+#define NEED_ICONV_CACHE 1 -+ -+/* didn't find fd_set */ -+#define NO_FD_SET 1 -+ -+/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -+/* #undef NO_MINUS_C_MINUS_O */ -+ -+/* global 'sys_errlist' not found */ -+#define NO_SYS_ERRLIST 1 -+ -+/* global 'sys_siglist' not found */ -+#define NO_SYS_SIGLIST 1 -+ -+/* global 'sys_siglist' not declared */ -+#define NO_SYS_SIGLIST_DECL 1 -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "glib" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "glib 2.28.1" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "glib" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "2.28.1" -+ -+/* Maximum POSIX RT priority */ -+/* #undef POSIX_MAX_PRIORITY */ -+ -+/* define if posix_memalign() can allocate any size */ -+/* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */ -+ -+/* Minimum POSIX RT priority */ -+/* #undef POSIX_MIN_PRIORITY */ -+ -+/* The POSIX RT yield function */ -+/* #undef POSIX_YIELD_FUNC */ -+ -+/* whether realloc (NULL,) works */ -+#define REALLOC_0_WORKS 1 -+ -+/* Define if you have correct malloc prototypes */ -+#ifndef _MSC_VER -+#define SANE_MALLOC_PROTOS 1 -+#else /* _MSC_VER */ -+/* #undef SANE_MALLOC_PROTOS */ -+#endif /* _MSC_VER */ -+ -+/* The size of `char', as computed by sizeof. */ -+#define SIZEOF_CHAR 1 -+ -+/* The size of `int', as computed by sizeof. */ -+#define SIZEOF_INT 4 -+ -+/* The size of `long', as computed by sizeof. */ -+#define SIZEOF_LONG 4 -+ -+/* The size of `long long', as computed by sizeof. */ -+#ifndef _MSC_VER -+#define SIZEOF_LONG_LONG 8 -+#else /* _MSC_VER */ -+#define SIZEOF_LONG_LONG 0 -+#endif /* _MSC_VER */ -+ -+/* The size of `short', as computed by sizeof. */ -+#define SIZEOF_SHORT 2 -+ -+/* The size of `size_t', as computed by sizeof. */ -+#define SIZEOF_SIZE_T 4 -+ -+/* The size of `void *', as computed by sizeof. */ -+#define SIZEOF_VOID_P 4 -+ -+/* The size of `__int64', as computed by sizeof. */ -+#define SIZEOF___INT64 8 -+ -+/* If using the C implementation of alloca, define if you know the -+ direction of stack growth for your system; otherwise it will be -+ automatically deduced at runtime. -+ STACK_DIRECTION > 0 => grows toward higher addresses -+ STACK_DIRECTION < 0 => grows toward lower addresses -+ STACK_DIRECTION = 0 => direction of growth unknown */ -+/* #undef STACK_DIRECTION */ -+ -+/* Number of arguments to statfs() */ -+/* #undef STATFS_ARGS */ -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Using GNU libiconv */ -+/* #undef USE_LIBICONV_GNU */ -+ -+/* Using a native implementation of iconv in a separate library */ -+#define USE_LIBICONV_NATIVE 1 -+ -+/* using the system-supplied PCRE library */ -+/* #undef USE_SYSTEM_PCRE */ -+ -+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most -+ significant byte first (like Motorola and SPARC, unlike Intel). */ -+#if defined AC_APPLE_UNIVERSAL_BUILD -+# if defined __BIG_ENDIAN__ -+# define WORDS_BIGENDIAN 1 -+# endif -+#else -+# ifndef WORDS_BIGENDIAN -+/* # undef WORDS_BIGENDIAN */ -+# endif -+#endif -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+/* #undef _FILE_OFFSET_BITS */ -+ -+/* Define for large files, on AIX-style hosts. */ -+/* #undef _LARGE_FILES */ -+ -+/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -+/* #undef _XOPEN_SOURCE */ -+ -+/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -+/* #undef _XOPEN_SOURCE_EXTENDED */ -+ -+/* Needed to get declarations for msg_control and msg_controllen on Solaris */ -+/* #undef __EXTENSIONS__ */ -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+ -+/* Define to long or long long if <inttypes.h> and <stdint.h> don't define. */ -+/* #undef intmax_t */ -+ -+/* Define to empty if the C compiler doesn't support this keyword. */ -+/* #undef signed */ -+ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ -+/* #undef size_t */ -+ ---- misc/glib-2.28.1/gio/gvdb/makefile.msc Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/gio/gvdb/makefile.msc Wed Aug 20 14:26:42 2008 -@@ -1 +1,24 @@ --dummy -+TOP = ..\..\.. -+ -+!INCLUDE ..\..\build\win32\make.msc -+ -+INCLUDES = \ -+ -FImsvc_recommended_pragmas.h \ -+ -I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \ -+ $(INTL_CFLAGS) \ -+ $(SOLARINC) -+ -+DEFINES = \ -+ -DG_LOG_DOMAIN=\"GLib-GIO\" \ -+ -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \ -+ -DGIO_COMPILATION -+ -+OBJECTS = \ -+ gvdb-reader.obj \ -+ gvdb-builder.obj -+ -+all : giogvdb.lib -+ -+giogvdb.lib : $(OBJECTS) -+ lib -out:giogvdb.lib $(OBJECTS) -+ ---- misc/glib-2.28.1/gio/win32/makefile.msc Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/gio/win32/makefile.msc Wed Aug 20 14:26:42 2008 -@@ -1 +1,27 @@ --dummy -+TOP = ..\..\.. -+ -+!INCLUDE ..\..\build\win32\make.msc -+ -+INCLUDES = \ -+ -FImsvc_recommended_pragmas.h \ -+ -I .. -I ..\..\glib -I ..\..\gmodule -I . -I ..\.. \ -+ $(INTL_CFLAGS) \ -+ $(SOLARINC) -+ -+DEFINES = \ -+ -DG_LOG_DOMAIN=\"GLib-GIO\" \ -+ -DGIO_MODULE_DIR=\"$(libdir)/gio/modules\" \ -+ -DGIO_COMPILATION -+ -+OBJECTS = \ -+ gwin32directorymonitor.obj \ -+ gwinhttpfile.obj \ -+ gwinhttpfileinputstream.obj \ -+ gwinhttpfileoutputstream.obj \ -+ gwinhttpvfs.obj \ -+ -+all : giowin32.lib -+ -+giowin32.lib : $(OBJECTS) -+ lib -out:giowin32.lib $(OBJECTS) -+ ---- misc/glib-2.28.1/gobject/gmarshal.c Wed Aug 20 14:33:55 2008 -+++ misc/build/glib-2.28.1/gobject/gmarshal.c Wed Aug 20 14:26:42 2008 -@@ -1,4 +1,13 @@ -+#include "config.h" - -+#include "gsourceclosure.h" -+#include "gboxed.h" -+#include "genums.h" -+#include "gmarshal.h" -+#include "gvalue.h" -+#include "gvaluetypes.h" -+#include "gparam.h" -+#include "gobject.h" - - #ifdef G_ENABLE_DEBUG - #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) diff --git a/glib/glib-2.28.1.noise.patch b/glib/glib-2.28.1.noise.patch deleted file mode 100644 index f42b08a97a64..000000000000 --- a/glib/glib-2.28.1.noise.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/glib-2.28.1/gio/tests/Makefile.in 2011-02-18 16:22:00.000000000 +0100 -+++ misc/build/glib-2.28.1/gio/tests/Makefile.in 2011-06-10 16:37:05.000000000 +0200 -@@ -1020,7 +1020,9 @@ - proxy_LDADD = $(progs_ldadd) \ - $(top_builddir)/gthread/libgthread-2.0.la - -+ifneq ($(MSGFMT),) - MISC_STUFF = test.mo -+endif - DISTCLEANFILES = \ - applications/mimeinfo.cache \ - org.gtk.test.enums.xml \ diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch deleted file mode 100644 index 49a6faa9c2a5..000000000000 --- a/glib/glib-2.28.1.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- misc/glib-2.28.1/gio/gzlibcompressor.c 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/gio/gzlibcompressor.c 2011-02-25 15:59:17.000000000 +0100 -@@ -73,7 +73,7 @@ - g_zlib_compressor_set_gzheader (GZlibCompressor *compressor) - { - /* On win32, these functions were not exported before 1.2.4 */ --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && ! defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - const gchar *filename; - - if (compressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP || ---- misc/glib-2.28.1/gio/gzlibdecompressor.c 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/gio/gzlibdecompressor.c 2011-02-25 16:00:43.000000000 +0100 -@@ -76,7 +76,7 @@ - g_zlib_decompressor_set_gzheader (GZlibDecompressor *decompressor) - { - /* On win32, these functions were not exported before 1.2.4 */ --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - if (decompressor->format != G_ZLIB_COMPRESSOR_FORMAT_GZIP) - return; - -@@ -376,7 +376,7 @@ - *bytes_read = inbuf_size - decompressor->zstream.avail_in; - *bytes_written = outbuf_size - decompressor->zstream.avail_out; - --#if !defined (G_OS_WIN32) || ZLIB_VERNUM >= 0x1240 -+#if (!defined (G_OS_WIN32) && !defined(BUILD_OS_APPLEOSX)) || ZLIB_VERNUM >= 0x1240 - if (decompressor->header_data != NULL && - decompressor->header_data->gzheader.done == 1) - { ---- misc/glib-2.28.1/glib/gatomic.c 2011-02-11 16:23:12.000000000 +0100 -+++ misc/build/glib-2.28.1/glib/gatomic.c 2011-02-25 15:51:45.000000000 +0100 -@@ -28,6 +28,7 @@ - #endif - - #include "gatomic.h" -+#include "gthread.h" - #include "gthreadprivate.h" - - /** ---- misc/glib-2.28.1/glib/gconvert.c -+++ misc/build/glib-2.28.1/glib/gconvert.c -@@ -58,13 +58,6 @@ - - #include "glibintl.h" - --#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) --#error GNU libiconv in use but included iconv.h not from libiconv --#endif --#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) --#error GNU libiconv not in use but included iconv.h is from libiconv --#endif -- - - /** - * SECTION:conversions - ---- misc/glib-2.28.1/configure -+++ misc/build/glib-2.28.1/configure -@@ -7097,6 +7097,7 @@ - fi - - -+if false; then - # Need suitable python path for greport - - -@@ -7325,6 +7326,7 @@ - - - -+fi - - - -@@ -7988,6 +7988,7 @@ - CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/po/LINGUAS' - - -+ if false; then - for ac_header in locale.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -@@ -8701,6 +8701,8 @@ - - LIBS="$INTLLIBS $LIBS" - -+fi -+ - GETTEXT_PACKAGE=glib20 - - ---- misc/glib-2.28.1/Makefile.in -+++ misc/build/glib-2.28.1/Makefile.in -@@ -422,7 +422,7 @@ - gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in - TEST_PROGS = - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} --SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs -+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests - DIST_SUBDIRS = $(SUBDIRS) build - bin_SCRIPTS = glib-gettextize - AM_CPPFLAGS = \ ---- misc/glib-2.28.1/glib/gi18n.h -+++ misc/build/glib-2.28.1/glib/gi18n.h -@@ -20,15 +20,10 @@ - #ifndef __G_I18N_H__ - #define __G_I18N_H__ - --#include <glib.h> -- --#include <libintl.h> --#include <string.h> -- --#define _(String) gettext (String) --#define Q_(String) g_dpgettext (NULL, String, 0) --#define N_(String) (String) --#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1) -+#define _(String) (String) -+#define Q_(String) (String) -+#define N_(String) (String) -+#define C_(Context,String) (String) - #define NC_(Context, String) (String) - - #endif /* __G_I18N_H__ */ ---- misc/glib-2.28.1/gio/tests/gsettings.c -+++ misc/build/glib-2.28.1/gio/tests/gsettings.c -@@ -1,7 +1,9 @@ -+#include "config.h" -+ - #include <stdlib.h> - #include <locale.h> --#include <libintl.h> - #include <gio/gio.h> -+#include "glibintl.h" - #include <gstdio.h> - #define G_SETTINGS_ENABLE_BACKEND - #include <gio/gsettingsbackend.h> ---- misc/glib-2.28.1/gio/tests/gschema-compile.c -+++ misc/build/glib-2.28.1/gio/tests/gschema-compile.c -@@ -1,8 +1,10 @@ -+#include "config.h" -+ - #include <stdlib.h> - #include <unistd.h> - #include <locale.h> --#include <libintl.h> - #include <gio/gio.h> -+#include "glibintl.h" - #include <gstdio.h> - - typedef struct { diff --git a/glib/makefile.mk b/glib/makefile.mk deleted file mode 100644 index eb9a72a3307c..000000000000 --- a/glib/makefile.mk +++ /dev/null @@ -1,390 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=glib -TARGET=so_glib - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_GLIB)" == "YES" -all: - @echo "An already available installation of glib should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- - -GLIBVERSION=2.28.1 - -TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION) -TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e - - -.IF "$(OS)"!="WNT" -PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch - -.IF "$(OS)"=="IOS" -CONFIGURE_FLAGS= \ - glib_cv_stack_grows=no \ - glib_cv_uscore=yes \ - ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes \ - ac_cv_func__NSGetEnviron=no \ - --disable-shared -FRAMEWORK=-framework CoreFoundation -.ELSE -CONFIGURE_FLAGS=--disable-static -.ENDIF - -.IF "$(OS)"=="MACOSX" && "$(CROSS_COMPILING)"=="YES" -CONFIGURE_FLAGS+= \ - glib_cv_stack_grows=no \ - glib_cv_uscore=yes \ - ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes \ - ac_cv_func__NSGetEnviron=yes -.ENDIF - -.IF "$(OS)" == "MACOSX" -CONFIGURE_FLAGS += \ - --prefix=/@.__________________________________________________$(EXTRPATH) -.ELSE -CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) -.END - -CONFIGURE_FLAGS+=--disable-fam -CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX" -CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external" -CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) $(FRAMEWORK)" - -.IF "$(CROSS_COMPILING)"=="YES" -CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) -.ENDIF - -CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure - -.IF "$(VERBOSE)"!="" -VFLAG=V=1 -.ENDIF - -BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS) - -.IF "$(OS)"!="IOS" - -.IF "$(OS)" == "MACOSX" -my_ext = .0$(DLLPOST) -.ELSE -my_ext = $(DLLPOST).0 -.END - -OUT2LIB+=gio/.libs/libgio-2.0$(my_ext) -OUT2LIB+=glib/.libs/libglib-2.0$(my_ext) -OUT2LIB+=gmodule/.libs/libgmodule-2.0$(my_ext) -OUT2LIB+=gobject/.libs/libgobject-2.0$(my_ext) -OUT2LIB+=gthread/.libs/libgthread-2.0$(my_ext) - -OUT2BIN_NONE+=gobject/glib-mkenums -OUT2BIN_NONE+=gobject/.libs/glib-genmarshal -OUT2BIN_NONE+=gio/.libs/glib-compile-schemas - -.ELSE - -OUT2LIB+=gio/.libs/libgio-2.0.a -OUT2LIB+=glib/.libs/libglib-2.0.a -OUT2LIB+=gmodule/.libs/libgmodule-2.0.a -OUT2LIB+=gobject/.libs/libgobject-2.0.a -OUT2LIB+=gthread/.libs/libgthread-2.0.a - -.ENDIF - -.ELSE - -CONVERTFILES=gobject/gmarshal.c - -PATCH_FILES=glib-2.28.1-win32.patch glib-2.28.1-win32-2.patch - -CONFIGURE_ACTION= - -ADDITIONAL_FILES= config.h \ - gio/gvdb/makefile.msc \ - gio/win32/makefile.msc \ - glib/glibconfig.h \ - gmodule/gmoduleconf.h \ - gobject/glib-mkenums - -BUILD_ACTION=unset debug; nmake -f makefile.msc - -OUT2BIN+=gio$/giolo.dll -OUT2BIN+=glib$/gliblo.dll -OUT2BIN+=gmodule$/gmodulelo.dll -OUT2BIN+=gobject$/gobjectlo.dll -OUT2BIN+=gthread$/gthreadlo.dll -OUT2BIN+=gobject$/glib-mkenums -OUT2BIN+=gobject$/glib-genmarshal.exe - -OUT2LIB+=build/win32/dirent/dirent.lib -OUT2LIB+=gio/gio-2.0.lib -OUT2LIB+=gio/gvdb/giogvdb.lib -OUT2LIB+=gio/win32/giowin32.lib -OUT2LIB+=glib/glib-2.0.lib -OUT2LIB+=glib/glib-2.28s.lib -OUT2LIB+=glib/gnulib/gnulib.lib -OUT2LIB+=glib/pcre/pcre.lib -OUT2LIB+=gmodule/gmodule-2.0.lib -OUT2LIB+=gobject/glib-genmarshal.lib -OUT2LIB+=gobject/gobject-2.0.lib -OUT2LIB+=gthread/gthread-2.0.lib - -.IF "$(OS)"=="WNT" -OUT2INC+=build$/win32$/dirent/dirent.h -.ENDIF -OUT2INC+=build$/win32$/make.msc -OUT2INC+=build$/win32$/module.defs - -.ENDIF - -OUT2INC+=glib/glib.h -OUT2INC+=glib/glib-object.h -OUT2INC+=glib/glibconfig.h -OUT2INC+=gmodule/gmodule.h - -OUT2INC+=gio/gdesktopappinfo.h -OUT2INC+=gio/gunixcredentialsmessage.h -OUT2INC+=gio/gunixinputstream.h -OUT2INC+=gio/gunixsocketaddress.h -OUT2INC+=gio/gfiledescriptorbased.h -OUT2INC+=gio/gunixfdlist.h -OUT2INC+=gio/gunixmounts.h -OUT2INC+=gio/gunixconnection.h -OUT2INC+=gio/gunixfdmessage.h -OUT2INC+=gio/gunixoutputstream.h - - -OUT2INC+=gio/gaction.h -OUT2INC+=gio/gfileicon.h -OUT2INC+=gio/gproxyaddressenumerator.h -OUT2INC+=gio/gactiongroup.h -OUT2INC+=gio/gfileinfo.h -OUT2INC+=gio/gproxyresolver.h -OUT2INC+=gio/gappinfo.h -OUT2INC+=gio/gfileinputstream.h -OUT2INC+=gio/gresolver.h -OUT2INC+=gio/gapplication.h -OUT2INC+=gio/gfileiostream.h -OUT2INC+=gio/gseekable.h -OUT2INC+=gio/gapplicationcommandline.h -OUT2INC+=gio/gfilemonitor.h -OUT2INC+=gio/gsettings.h -OUT2INC+=gio/gasyncinitable.h -OUT2INC+=gio/gfilenamecompleter.h -OUT2INC+=gio/gsettingsbackend.h -OUT2INC+=gio/gasyncresult.h -OUT2INC+=gio/gfileoutputstream.h -OUT2INC+=gio/gsimpleaction.h -OUT2INC+=gio/gbufferedinputstream.h -OUT2INC+=gio/gfilterinputstream.h -OUT2INC+=gio/gsimpleactiongroup.h -OUT2INC+=gio/gbufferedoutputstream.h -OUT2INC+=gio/gfilteroutputstream.h -OUT2INC+=gio/gsimpleasyncresult.h -OUT2INC+=gio/gcancellable.h -OUT2INC+=gio/gicon.h -OUT2INC+=gio/gsimplepermission.h -OUT2INC+=gio/gcharsetconverter.h -OUT2INC+=gio/ginetaddress.h -OUT2INC+=gio/gsocket.h -OUT2INC+=gio/gcontenttype.h -OUT2INC+=gio/ginetsocketaddress.h -OUT2INC+=gio/gsocketaddress.h -OUT2INC+=gio/gconverter.h -OUT2INC+=gio/ginitable.h -OUT2INC+=gio/gsocketaddressenumerator.h -OUT2INC+=gio/gconverterinputstream.h -OUT2INC+=gio/ginputstream.h -OUT2INC+=gio/gsocketclient.h -OUT2INC+=gio/gconverteroutputstream.h -OUT2INC+=gio/gio.h -OUT2INC+=gio/gsocketconnectable.h -OUT2INC+=gio/gcredentials.h -OUT2INC+=gio/gioenums.h -OUT2INC+=gio/gsocketconnection.h -OUT2INC+=gio/gdatainputstream.h -OUT2INC+=gio/gioenumtypes.h -OUT2INC+=gio/gsocketcontrolmessage.h -OUT2INC+=gio/gdataoutputstream.h -OUT2INC+=gio/gioerror.h -OUT2INC+=gio/gsocketlistener.h -OUT2INC+=gio/gdbusaddress.h -OUT2INC+=gio/giomodule.h -OUT2INC+=gio/gsocketservice.h -OUT2INC+=gio/gdbusauthobserver.h -OUT2INC+=gio/gioscheduler.h -OUT2INC+=gio/gsrvtarget.h -OUT2INC+=gio/gdbusconnection.h -OUT2INC+=gio/giostream.h -OUT2INC+=gio/gtcpconnection.h -OUT2INC+=gio/gdbuserror.h -OUT2INC+=gio/giotypes.h -OUT2INC+=gio/gtcpwrapperconnection.h -OUT2INC+=gio/gdbusintrospection.h -OUT2INC+=gio/gloadableicon.h -OUT2INC+=gio/gthemedicon.h -OUT2INC+=gio/gdbusmessage.h -OUT2INC+=gio/gmemoryinputstream.h -OUT2INC+=gio/gthreadedsocketservice.h -OUT2INC+=gio/gdbusmethodinvocation.h -OUT2INC+=gio/gmemoryoutputstream.h -OUT2INC+=gio/gtlsbackend.h -OUT2INC+=gio/gdbusnameowning.h -OUT2INC+=gio/gmount.h -OUT2INC+=gio/gtlscertificate.h -OUT2INC+=gio/gdbusnamewatching.h -OUT2INC+=gio/gmountoperation.h -OUT2INC+=gio/gtlsclientconnection.h -OUT2INC+=gio/gdbusproxy.h -OUT2INC+=gio/gnativevolumemonitor.h -OUT2INC+=gio/gtlsconnection.h -OUT2INC+=gio/gdbusserver.h -OUT2INC+=gio/gnetworkaddress.h -OUT2INC+=gio/gtlsserverconnection.h -OUT2INC+=gio/gdbusutils.h -OUT2INC+=gio/gnetworkservice.h -OUT2INC+=gio/gvfs.h -OUT2INC+=gio/gdrive.h -OUT2INC+=gio/goutputstream.h -OUT2INC+=gio/gvolume.h -OUT2INC+=gio/gemblem.h -OUT2INC+=gio/gpermission.h -OUT2INC+=gio/gvolumemonitor.h -OUT2INC+=gio/gemblemedicon.h -OUT2INC+=gio/gpollableinputstream.h -OUT2INC+=gio/gzlibcompressor.h -OUT2INC+=gio/gfile.h -OUT2INC+=gio/gpollableoutputstream.h -OUT2INC+=gio/gzlibdecompressor.h -OUT2INC+=gio/gfileattribute.h -OUT2INC+=gio/gproxy.h -OUT2INC+=gio/gfileenumerator.h -OUT2INC+=gio/gproxyaddress.h - -OUT2INC+=glib/galloca.h -OUT2INC+=glib/gconvert.h -OUT2INC+=glib/gi18n.h -OUT2INC+=glib/goption.h -OUT2INC+=glib/gscanner.h -OUT2INC+=glib/gthreadpool.h -OUT2INC+=glib/garray.h -OUT2INC+=glib/gdataset.h -OUT2INC+=glib/giochannel.h -OUT2INC+=glib/gpattern.h -OUT2INC+=glib/gsequence.h -OUT2INC+=glib/gtimer.h -OUT2INC+=glib/gasyncqueue.h -OUT2INC+=glib/gdate.h -OUT2INC+=glib/gkeyfile.h -OUT2INC+=glib/gpoll.h -OUT2INC+=glib/gshell.h -OUT2INC+=glib/gtimezone.h -OUT2INC+=glib/gatomic.h -OUT2INC+=glib/gdatetime.h -OUT2INC+=glib/glist.h -OUT2INC+=glib/gprimes.h -OUT2INC+=glib/gslice.h -OUT2INC+=glib/gtree.h -OUT2INC+=glib/gbacktrace.h -OUT2INC+=glib/gdir.h -OUT2INC+=glib/gmacros.h -OUT2INC+=glib/gprintf.h -OUT2INC+=glib/gslist.h -OUT2INC+=glib/gtypes.h -OUT2INC+=glib/gbase64.h -OUT2INC+=glib/gerror.h -OUT2INC+=glib/gmain.h -OUT2INC+=glib/gqsort.h -OUT2INC+=glib/gspawn.h -OUT2INC+=glib/gunicode.h -OUT2INC+=glib/gbitlock.h -OUT2INC+=glib/gfileutils.h -OUT2INC+=glib/gmappedfile.h -OUT2INC+=glib/gquark.h -OUT2INC+=glib/gstdio.h -OUT2INC+=glib/gurifuncs.h -OUT2INC+=glib/gbookmarkfile.h -OUT2INC+=glib/ghash.h -OUT2INC+=glib/gmarkup.h -OUT2INC+=glib/gqueue.h -OUT2INC+=glib/gstrfuncs.h -OUT2INC+=glib/gutils.h -OUT2INC+=glib/gcache.h -OUT2INC+=glib/ghook.h -OUT2INC+=glib/gmem.h -OUT2INC+=glib/grand.h -OUT2INC+=glib/gstring.h -OUT2INC+=glib/gvariant.h -OUT2INC+=glib/gchecksum.h -OUT2INC+=glib/ghostutils.h -OUT2INC+=glib/gmessages.h -OUT2INC+=glib/gregex.h -OUT2INC+=glib/gtestutils.h -OUT2INC+=glib/gvarianttype.h -OUT2INC+=glib/gcompletion.h -OUT2INC+=glib/gi18n-lib.h -OUT2INC+=glib/gnode.h -OUT2INC+=glib/grel.h -OUT2INC+=glib/gthread.h -OUT2INC+=glib/gwin32.h - - -OUT2INC+=gobject/gbinding.h -OUT2INC+=gobject/gmarshal.h -OUT2INC+=gobject/gparamspecs.h -OUT2INC+=gobject/gtypemodule.h -OUT2INC+=gobject/gvaluecollector.h -OUT2INC+=gobject/gboxed.h -OUT2INC+=gobject/gobject.h -OUT2INC+=gobject/gsignal.h -OUT2INC+=gobject/gtypeplugin.h -OUT2INC+=gobject/gvaluetypes.h -OUT2INC+=gobject/gclosure.h -OUT2INC+=gobject/gobjectnotifyqueue.c -OUT2INC+=gobject/gsourceclosure.h -OUT2INC+=gobject/gvalue.h -OUT2INC+=gobject/genums.h -OUT2INC+=gobject/gparam.h -OUT2INC+=gobject/gtype.h -OUT2INC+=gobject/gvaluearray.h - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - diff --git a/glib/prj/build.lst b/glib/prj/build.lst deleted file mode 100644 index d8be54e59ee2..000000000000 --- a/glib/prj/build.lst +++ /dev/null @@ -1,3 +0,0 @@ -gl glib : GETTEXT:gettext ZLIB:zlib NULL -gl glib usr1 - all gl_mkout NULL -gl glib nmake - all gl_glib NULL diff --git a/glib/prj/d.lst b/glib/prj/d.lst deleted file mode 100644 index cb207230b716..000000000000 --- a/glib/prj/d.lst +++ /dev/null @@ -1,252 +0,0 @@ -mkdir: %_DEST%\inc\external -..\%__SRC%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.0.dylib -symlink: %_DEST%\lib\libgio-2.0.0.dylib %_DEST%\lib\libgio-2.0.dylib -..\%__SRC%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.0.dylib -symlink: %_DEST%\lib\libgmodule-2.0.0.dylib %_DEST%\lib\libgmodule-2.0.dylib -..\%__SRC%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.0.dylib -symlink: %_DEST%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.dylib -..\%__SRC%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.0.dylib -symlink: %_DEST%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.dylib -..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.0.dylib -symlink: %_DEST%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.dylib -..\%__SRC%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so.0 -symlink: %_DEST%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so -..\%__SRC%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so.0 -symlink: %_DEST%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so -..\%__SRC%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so.0 -symlink: %_DEST%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so -..\%__SRC%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so.0 -symlink: %_DEST%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so -..\%__SRC%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so.0 -symlink: %_DEST%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so -..\%__SRC%\bin\*.dll %_DEST%\bin -..\%__SRC%\bin\glib-mkenums %_DEST%\bin\glib-mkenums -..\%__SRC%\bin\glib-genmarshal %_DEST%\bin\glib-genmarshal -..\%__SRC%\bin\glib-genmarshal.exe %_DEST%\bin\glib-genmarshal.exe -..\%__SRC%\bin\glib-compile-schemas %_DEST%\bin\glib-compile-schemas -..\%__SRC%\lib\gio-2.0.lib %_DEST%\lib\gio-2.0.lib -..\%__SRC%\lib\gmodule-2.0.lib %_DEST%\lib\gmodule-2.0.lib -..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib\gthread-2.0.lib -..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib\glib-2.0.lib -..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib\gobject-2.0.lib -..\%__SRC%\lib\dirent.lib %_DEST%\lib\dirent.lib - -mkdir: %_DEST%\inc\external\gio-unix-2.0 -mkdir: %_DEST%\inc\external\gio-unix-2.0\gio -..\%__SRC%\inc\gdesktopappinfo.h %_DEST%\inc\external\gio-unix-2.0\gio\gdesktopappinfo.h -..\%__SRC%\inc\gunixcredentialsmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixcredentialsmessage.h -..\%__SRC%\inc\gunixinputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixinputstream.h -..\%__SRC%\inc\gunixsocketaddress.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixsocketaddress.h -..\%__SRC%\inc\gfiledescriptorbased.h %_DEST%\inc\external\gio-unix-2.0\gio\gfiledescriptorbased.h -..\%__SRC%\inc\gunixfdlist.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdlist.h -..\%__SRC%\inc\gunixmounts.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixmounts.h -..\%__SRC%\inc\gunixconnection.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixconnection.h -..\%__SRC%\inc\gunixfdmessage.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixfdmessage.h -..\%__SRC%\inc\gunixoutputstream.h %_DEST%\inc\external\gio-unix-2.0\gio\gunixoutputstream.h - -mkdir: %_DEST%\inc\external\glib-2.0 -..\%__SRC%\inc\glib-object.h %_DEST%\inc\external\glib-2.0\glib-object.h -..\%__SRC%\inc\glib.h %_DEST%\inc\external\glib-2.0\glib.h -..\%__SRC%\inc\glibconfig.h %_DEST%\inc\external\glib-2.0\glibconfig.h -..\%__SRC%\inc\gmodule.h %_DEST%\inc\external\glib-2.0\gmodule.h -..\%__SRC%\inc\make.msc %_DEST%\inc\external\glib-2.0\make.msc -..\%__SRC%\inc\module.defs %_DEST%\inc\external\glib-2.0\module.defs -..\%__SRC%\inc\dirent.h %_DEST%\inc\external\glib-2.0\dirent.h - -mkdir: %_DEST%\inc\external\glib-2.0\gio -..\%__SRC%\inc\gaction.h %_DEST%\inc\external\glib-2.0\gio\gaction.h -..\%__SRC%\inc\gfileicon.h %_DEST%\inc\external\glib-2.0\gio\gfileicon.h -..\%__SRC%\inc\gproxyaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddressenumerator.h -..\%__SRC%\inc\gactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gactiongroup.h -..\%__SRC%\inc\gfileinfo.h %_DEST%\inc\external\glib-2.0\gio\gfileinfo.h -..\%__SRC%\inc\gproxyresolver.h %_DEST%\inc\external\glib-2.0\gio\gproxyresolver.h -..\%__SRC%\inc\gappinfo.h %_DEST%\inc\external\glib-2.0\gio\gappinfo.h -..\%__SRC%\inc\gfileinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileinputstream.h -..\%__SRC%\inc\gresolver.h %_DEST%\inc\external\glib-2.0\gio\gresolver.h -..\%__SRC%\inc\gapplication.h %_DEST%\inc\external\glib-2.0\gio\gapplication.h -..\%__SRC%\inc\gfileiostream.h %_DEST%\inc\external\glib-2.0\gio\gfileiostream.h -..\%__SRC%\inc\gseekable.h %_DEST%\inc\external\glib-2.0\gio\gseekable.h -..\%__SRC%\inc\gapplicationcommandline.h %_DEST%\inc\external\glib-2.0\gio\gapplicationcommandline.h -..\%__SRC%\inc\gfilemonitor.h %_DEST%\inc\external\glib-2.0\gio\gfilemonitor.h -..\%__SRC%\inc\gsettings.h %_DEST%\inc\external\glib-2.0\gio\gsettings.h -..\%__SRC%\inc\gasyncinitable.h %_DEST%\inc\external\glib-2.0\gio\gasyncinitable.h -..\%__SRC%\inc\gfilenamecompleter.h %_DEST%\inc\external\glib-2.0\gio\gfilenamecompleter.h -..\%__SRC%\inc\gsettingsbackend.h %_DEST%\inc\external\glib-2.0\gio\gsettingsbackend.h -..\%__SRC%\inc\gasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gasyncresult.h -..\%__SRC%\inc\gfileoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfileoutputstream.h -..\%__SRC%\inc\gsimpleaction.h %_DEST%\inc\external\glib-2.0\gio\gsimpleaction.h -..\%__SRC%\inc\gbufferedinputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedinputstream.h -..\%__SRC%\inc\gfilterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilterinputstream.h -..\%__SRC%\inc\gsimpleactiongroup.h %_DEST%\inc\external\glib-2.0\gio\gsimpleactiongroup.h -..\%__SRC%\inc\gbufferedoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gbufferedoutputstream.h -..\%__SRC%\inc\gfilteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gfilteroutputstream.h -..\%__SRC%\inc\gsimpleasyncresult.h %_DEST%\inc\external\glib-2.0\gio\gsimpleasyncresult.h -..\%__SRC%\inc\gcancellable.h %_DEST%\inc\external\glib-2.0\gio\gcancellable.h -..\%__SRC%\inc\gicon.h %_DEST%\inc\external\glib-2.0\gio\gicon.h -..\%__SRC%\inc\gsimplepermission.h %_DEST%\inc\external\glib-2.0\gio\gsimplepermission.h -..\%__SRC%\inc\gcharsetconverter.h %_DEST%\inc\external\glib-2.0\gio\gcharsetconverter.h -..\%__SRC%\inc\ginetaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetaddress.h -..\%__SRC%\inc\gsocket.h %_DEST%\inc\external\glib-2.0\gio\gsocket.h -..\%__SRC%\inc\gcontenttype.h %_DEST%\inc\external\glib-2.0\gio\gcontenttype.h -..\%__SRC%\inc\ginetsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\ginetsocketaddress.h -..\%__SRC%\inc\gsocketaddress.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddress.h -..\%__SRC%\inc\gconverter.h %_DEST%\inc\external\glib-2.0\gio\gconverter.h -..\%__SRC%\inc\ginitable.h %_DEST%\inc\external\glib-2.0\gio\ginitable.h -..\%__SRC%\inc\gsocketaddressenumerator.h %_DEST%\inc\external\glib-2.0\gio\gsocketaddressenumerator.h -..\%__SRC%\inc\gconverterinputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverterinputstream.h -..\%__SRC%\inc\ginputstream.h %_DEST%\inc\external\glib-2.0\gio\ginputstream.h -..\%__SRC%\inc\gsocketclient.h %_DEST%\inc\external\glib-2.0\gio\gsocketclient.h -..\%__SRC%\inc\gconverteroutputstream.h %_DEST%\inc\external\glib-2.0\gio\gconverteroutputstream.h -..\%__SRC%\inc\gio.h %_DEST%\inc\external\glib-2.0\gio\gio.h -..\%__SRC%\inc\gsocketconnectable.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnectable.h -..\%__SRC%\inc\gcredentials.h %_DEST%\inc\external\glib-2.0\gio\gcredentials.h -..\%__SRC%\inc\gioenums.h %_DEST%\inc\external\glib-2.0\gio\gioenums.h -..\%__SRC%\inc\gsocketconnection.h %_DEST%\inc\external\glib-2.0\gio\gsocketconnection.h -..\%__SRC%\inc\gdatainputstream.h %_DEST%\inc\external\glib-2.0\gio\gdatainputstream.h -..\%__SRC%\inc\gioenumtypes.h %_DEST%\inc\external\glib-2.0\gio\gioenumtypes.h -..\%__SRC%\inc\gsocketcontrolmessage.h %_DEST%\inc\external\glib-2.0\gio\gsocketcontrolmessage.h -..\%__SRC%\inc\gdataoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gdataoutputstream.h -..\%__SRC%\inc\gioerror.h %_DEST%\inc\external\glib-2.0\gio\gioerror.h -..\%__SRC%\inc\gsocketlistener.h %_DEST%\inc\external\glib-2.0\gio\gsocketlistener.h -..\%__SRC%\inc\gdbusaddress.h %_DEST%\inc\external\glib-2.0\gio\gdbusaddress.h -..\%__SRC%\inc\giomodule.h %_DEST%\inc\external\glib-2.0\gio\giomodule.h -..\%__SRC%\inc\gsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gsocketservice.h -..\%__SRC%\inc\gdbusauthobserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusauthobserver.h -..\%__SRC%\inc\gioscheduler.h %_DEST%\inc\external\glib-2.0\gio\gioscheduler.h -..\%__SRC%\inc\gsrvtarget.h %_DEST%\inc\external\glib-2.0\gio\gsrvtarget.h -..\%__SRC%\inc\gdbusconnection.h %_DEST%\inc\external\glib-2.0\gio\gdbusconnection.h -..\%__SRC%\inc\giostream.h %_DEST%\inc\external\glib-2.0\gio\giostream.h -..\%__SRC%\inc\gtcpconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpconnection.h -..\%__SRC%\inc\gdbuserror.h %_DEST%\inc\external\glib-2.0\gio\gdbuserror.h -..\%__SRC%\inc\giotypes.h %_DEST%\inc\external\glib-2.0\gio\giotypes.h -..\%__SRC%\inc\gtcpwrapperconnection.h %_DEST%\inc\external\glib-2.0\gio\gtcpwrapperconnection.h -..\%__SRC%\inc\gdbusintrospection.h %_DEST%\inc\external\glib-2.0\gio\gdbusintrospection.h -..\%__SRC%\inc\gloadableicon.h %_DEST%\inc\external\glib-2.0\gio\gloadableicon.h -..\%__SRC%\inc\gthemedicon.h %_DEST%\inc\external\glib-2.0\gio\gthemedicon.h -..\%__SRC%\inc\gdbusmessage.h %_DEST%\inc\external\glib-2.0\gio\gdbusmessage.h -..\%__SRC%\inc\gmemoryinputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryinputstream.h -..\%__SRC%\inc\gthreadedsocketservice.h %_DEST%\inc\external\glib-2.0\gio\gthreadedsocketservice.h -..\%__SRC%\inc\gdbusmethodinvocation.h %_DEST%\inc\external\glib-2.0\gio\gdbusmethodinvocation.h -..\%__SRC%\inc\gmemoryoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gmemoryoutputstream.h -..\%__SRC%\inc\gtlsbackend.h %_DEST%\inc\external\glib-2.0\gio\gtlsbackend.h -..\%__SRC%\inc\gdbusnameowning.h %_DEST%\inc\external\glib-2.0\gio\gdbusnameowning.h -..\%__SRC%\inc\gmount.h %_DEST%\inc\external\glib-2.0\gio\gmount.h -..\%__SRC%\inc\gtlscertificate.h %_DEST%\inc\external\glib-2.0\gio\gtlscertificate.h -..\%__SRC%\inc\gdbusnamewatching.h %_DEST%\inc\external\glib-2.0\gio\gdbusnamewatching.h -..\%__SRC%\inc\gmountoperation.h %_DEST%\inc\external\glib-2.0\gio\gmountoperation.h -..\%__SRC%\inc\gtlsclientconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsclientconnection.h -..\%__SRC%\inc\gdbusproxy.h %_DEST%\inc\external\glib-2.0\gio\gdbusproxy.h -..\%__SRC%\inc\gnativevolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gnativevolumemonitor.h -..\%__SRC%\inc\gtlsconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsconnection.h -..\%__SRC%\inc\gdbusserver.h %_DEST%\inc\external\glib-2.0\gio\gdbusserver.h -..\%__SRC%\inc\gnetworkaddress.h %_DEST%\inc\external\glib-2.0\gio\gnetworkaddress.h -..\%__SRC%\inc\gtlsserverconnection.h %_DEST%\inc\external\glib-2.0\gio\gtlsserverconnection.h -..\%__SRC%\inc\gdbusutils.h %_DEST%\inc\external\glib-2.0\gio\gdbusutils.h -..\%__SRC%\inc\gnetworkservice.h %_DEST%\inc\external\glib-2.0\gio\gnetworkservice.h -..\%__SRC%\inc\gvfs.h %_DEST%\inc\external\glib-2.0\gio\gvfs.h -..\%__SRC%\inc\gdrive.h %_DEST%\inc\external\glib-2.0\gio\gdrive.h -..\%__SRC%\inc\goutputstream.h %_DEST%\inc\external\glib-2.0\gio\goutputstream.h -..\%__SRC%\inc\gvolume.h %_DEST%\inc\external\glib-2.0\gio\gvolume.h -..\%__SRC%\inc\gemblem.h %_DEST%\inc\external\glib-2.0\gio\gemblem.h -..\%__SRC%\inc\gpermission.h %_DEST%\inc\external\glib-2.0\gio\gpermission.h -..\%__SRC%\inc\gvolumemonitor.h %_DEST%\inc\external\glib-2.0\gio\gvolumemonitor.h -..\%__SRC%\inc\gemblemedicon.h %_DEST%\inc\external\glib-2.0\gio\gemblemedicon.h -..\%__SRC%\inc\gpollableinputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableinputstream.h -..\%__SRC%\inc\gzlibcompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibcompressor.h -..\%__SRC%\inc\gfile.h %_DEST%\inc\external\glib-2.0\gio\gfile.h -..\%__SRC%\inc\gpollableoutputstream.h %_DEST%\inc\external\glib-2.0\gio\gpollableoutputstream.h -..\%__SRC%\inc\gzlibdecompressor.h %_DEST%\inc\external\glib-2.0\gio\gzlibdecompressor.h -..\%__SRC%\inc\gfileattribute.h %_DEST%\inc\external\glib-2.0\gio\gfileattribute.h -..\%__SRC%\inc\gproxy.h %_DEST%\inc\external\glib-2.0\gio\gproxy.h -..\%__SRC%\inc\gfileenumerator.h %_DEST%\inc\external\glib-2.0\gio\gfileenumerator.h -..\%__SRC%\inc\gproxyaddress.h %_DEST%\inc\external\glib-2.0\gio\gproxyaddress.h - -mkdir: %_DEST%\inc\external\glib-2.0\glib - -..\%__SRC%\inc\galloca.h %_DEST%\inc\external\glib-2.0\glib\galloca.h -..\%__SRC%\inc\gconvert.h %_DEST%\inc\external\glib-2.0\glib\gconvert.h -..\%__SRC%\inc\gi18n.h %_DEST%\inc\external\glib-2.0\glib\gi18n.h -..\%__SRC%\inc\goption.h %_DEST%\inc\external\glib-2.0\glib\goption.h -..\%__SRC%\inc\gscanner.h %_DEST%\inc\external\glib-2.0\glib\gscanner.h -..\%__SRC%\inc\gthreadpool.h %_DEST%\inc\external\glib-2.0\glib\gthreadpool.h -..\%__SRC%\inc\garray.h %_DEST%\inc\external\glib-2.0\glib\garray.h -..\%__SRC%\inc\gdataset.h %_DEST%\inc\external\glib-2.0\glib\gdataset.h -..\%__SRC%\inc\giochannel.h %_DEST%\inc\external\glib-2.0\glib\giochannel.h -..\%__SRC%\inc\gpattern.h %_DEST%\inc\external\glib-2.0\glib\gpattern.h -..\%__SRC%\inc\gsequence.h %_DEST%\inc\external\glib-2.0\glib\gsequence.h -..\%__SRC%\inc\gtimer.h %_DEST%\inc\external\glib-2.0\glib\gtimer.h -..\%__SRC%\inc\gasyncqueue.h %_DEST%\inc\external\glib-2.0\glib\gasyncqueue.h -..\%__SRC%\inc\gdate.h %_DEST%\inc\external\glib-2.0\glib\gdate.h -..\%__SRC%\inc\gkeyfile.h %_DEST%\inc\external\glib-2.0\glib\gkeyfile.h -..\%__SRC%\inc\gpoll.h %_DEST%\inc\external\glib-2.0\glib\gpoll.h -..\%__SRC%\inc\gshell.h %_DEST%\inc\external\glib-2.0\glib\gshell.h -..\%__SRC%\inc\gtimezone.h %_DEST%\inc\external\glib-2.0\glib\gtimezone.h -..\%__SRC%\inc\gatomic.h %_DEST%\inc\external\glib-2.0\glib\gatomic.h -..\%__SRC%\inc\gdatetime.h %_DEST%\inc\external\glib-2.0\glib\gdatetime.h -..\%__SRC%\inc\glist.h %_DEST%\inc\external\glib-2.0\glib\glist.h -..\%__SRC%\inc\gprimes.h %_DEST%\inc\external\glib-2.0\glib\gprimes.h -..\%__SRC%\inc\gslice.h %_DEST%\inc\external\glib-2.0\glib\gslice.h -..\%__SRC%\inc\gtree.h %_DEST%\inc\external\glib-2.0\glib\gtree.h -..\%__SRC%\inc\gbacktrace.h %_DEST%\inc\external\glib-2.0\glib\gbacktrace.h -..\%__SRC%\inc\gdir.h %_DEST%\inc\external\glib-2.0\glib\gdir.h -..\%__SRC%\inc\gmacros.h %_DEST%\inc\external\glib-2.0\glib\gmacros.h -..\%__SRC%\inc\gprintf.h %_DEST%\inc\external\glib-2.0\glib\gprintf.h -..\%__SRC%\inc\gslist.h %_DEST%\inc\external\glib-2.0\glib\gslist.h -..\%__SRC%\inc\gtypes.h %_DEST%\inc\external\glib-2.0\glib\gtypes.h -..\%__SRC%\inc\gbase64.h %_DEST%\inc\external\glib-2.0\glib\gbase64.h -..\%__SRC%\inc\gerror.h %_DEST%\inc\external\glib-2.0\glib\gerror.h -..\%__SRC%\inc\gmain.h %_DEST%\inc\external\glib-2.0\glib\gmain.h -..\%__SRC%\inc\gqsort.h %_DEST%\inc\external\glib-2.0\glib\gqsort.h -..\%__SRC%\inc\gspawn.h %_DEST%\inc\external\glib-2.0\glib\gspawn.h -..\%__SRC%\inc\gunicode.h %_DEST%\inc\external\glib-2.0\glib\gunicode.h -..\%__SRC%\inc\gbitlock.h %_DEST%\inc\external\glib-2.0\glib\gbitlock.h -..\%__SRC%\inc\gfileutils.h %_DEST%\inc\external\glib-2.0\glib\gfileutils.h -..\%__SRC%\inc\gmappedfile.h %_DEST%\inc\external\glib-2.0\glib\gmappedfile.h -..\%__SRC%\inc\gquark.h %_DEST%\inc\external\glib-2.0\glib\gquark.h -..\%__SRC%\inc\gstdio.h %_DEST%\inc\external\glib-2.0\glib\gstdio.h -..\%__SRC%\inc\gurifuncs.h %_DEST%\inc\external\glib-2.0\glib\gurifuncs.h -..\%__SRC%\inc\gbookmarkfile.h %_DEST%\inc\external\glib-2.0\glib\gbookmarkfile.h -..\%__SRC%\inc\ghash.h %_DEST%\inc\external\glib-2.0\glib\ghash.h -..\%__SRC%\inc\gmarkup.h %_DEST%\inc\external\glib-2.0\glib\gmarkup.h -..\%__SRC%\inc\gqueue.h %_DEST%\inc\external\glib-2.0\glib\gqueue.h -..\%__SRC%\inc\gstrfuncs.h %_DEST%\inc\external\glib-2.0\glib\gstrfuncs.h -..\%__SRC%\inc\gutils.h %_DEST%\inc\external\glib-2.0\glib\gutils.h -..\%__SRC%\inc\gcache.h %_DEST%\inc\external\glib-2.0\glib\gcache.h -..\%__SRC%\inc\ghook.h %_DEST%\inc\external\glib-2.0\glib\ghook.h -..\%__SRC%\inc\gmem.h %_DEST%\inc\external\glib-2.0\glib\gmem.h -..\%__SRC%\inc\grand.h %_DEST%\inc\external\glib-2.0\glib\grand.h -..\%__SRC%\inc\gstring.h %_DEST%\inc\external\glib-2.0\glib\gstring.h -..\%__SRC%\inc\gvariant.h %_DEST%\inc\external\glib-2.0\glib\gvariant.h -..\%__SRC%\inc\gchecksum.h %_DEST%\inc\external\glib-2.0\glib\gchecksum.h -..\%__SRC%\inc\ghostutils.h %_DEST%\inc\external\glib-2.0\glib\ghostutils.h -..\%__SRC%\inc\gmessages.h %_DEST%\inc\external\glib-2.0\glib\gmessages.h -..\%__SRC%\inc\gregex.h %_DEST%\inc\external\glib-2.0\glib\gregex.h -..\%__SRC%\inc\gtestutils.h %_DEST%\inc\external\glib-2.0\glib\gtestutils.h -..\%__SRC%\inc\gvarianttype.h %_DEST%\inc\external\glib-2.0\glib\gvarianttype.h -..\%__SRC%\inc\gcompletion.h %_DEST%\inc\external\glib-2.0\glib\gcompletion.h -..\%__SRC%\inc\gi18n-lib.h %_DEST%\inc\external\glib-2.0\glib\gi18n-lib.h -..\%__SRC%\inc\gnode.h %_DEST%\inc\external\glib-2.0\glib\gnode.h -..\%__SRC%\inc\grel.h %_DEST%\inc\external\glib-2.0\glib\grel.h -..\%__SRC%\inc\gthread.h %_DEST%\inc\external\glib-2.0\glib\gthread.h -..\%__SRC%\inc\gwin32.h %_DEST%\inc\external\glib-2.0\glib\gwin32.h - -mkdir: %_DEST%\inc\external\glib-2.0\gobject -..\%__SRC%\inc\gbinding.h %_DEST%\inc\external\glib-2.0\gobject\gbinding.h -..\%__SRC%\inc\gmarshal.h %_DEST%\inc\external\glib-2.0\gobject\gmarshal.h -..\%__SRC%\inc\gparamspecs.h %_DEST%\inc\external\glib-2.0\gobject\gparamspecs.h -..\%__SRC%\inc\gtypemodule.h %_DEST%\inc\external\glib-2.0\gobject\gtypemodule.h -..\%__SRC%\inc\gvaluecollector.h %_DEST%\inc\external\glib-2.0\gobject\gvaluecollector.h -..\%__SRC%\inc\gboxed.h %_DEST%\inc\external\glib-2.0\gobject\gboxed.h -..\%__SRC%\inc\gobject.h %_DEST%\inc\external\glib-2.0\gobject\gobject.h -..\%__SRC%\inc\gsignal.h %_DEST%\inc\external\glib-2.0\gobject\gsignal.h -..\%__SRC%\inc\gtypeplugin.h %_DEST%\inc\external\glib-2.0\gobject\gtypeplugin.h -..\%__SRC%\inc\gvaluetypes.h %_DEST%\inc\external\glib-2.0\gobject\gvaluetypes.h -..\%__SRC%\inc\gclosure.h %_DEST%\inc\external\glib-2.0\gobject\gclosure.h -..\%__SRC%\inc\gobjectnotifyqueue.c %_DEST%\inc\external\glib-2.0\gobject\gobjectnotifyqueue.c -..\%__SRC%\inc\gsourceclosure.h %_DEST%\inc\external\glib-2.0\gobject\gsourceclosure.h -..\%__SRC%\inc\gvalue.h %_DEST%\inc\external\glib-2.0\gobject\gvalue.h -..\%__SRC%\inc\genums.h %_DEST%\inc\external\glib-2.0\gobject\genums.h -..\%__SRC%\inc\gparam.h %_DEST%\inc\external\glib-2.0\gobject\gparam.h -..\%__SRC%\inc\gtype.h %_DEST%\inc\external\glib-2.0\gobject\gtype.h -..\%__SRC%\inc\gvaluearray.h %_DEST%\inc\external\glib-2.0\gobject\gvaluearray.h - diff --git a/glib/prj/dmake b/glib/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/glib/prj/dmake +++ /dev/null |