diff options
| author | Hans Breuer <hans@breuer.org> | 2004-10-29 20:58:04 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2004-10-29 20:58:04 +0000 |
| commit | aa410edee6042a526559f0c534072013252cce52 (patch) | |
| tree | c27d0131e9bfa62fcde8ec68a8e1049b82871cb9 /gobject | |
| parent | dd028d11f6ab98cd41045957160d5ee4e6f74047 (diff) | |
| download | glib-aa410edee6042a526559f0c534072013252cce52.tar.gz | |
updated [and finally fixed my script to produce ready to go de-in(ed)
2004-10-29 Hans Breuer <hans@breuer.org>
* glibconfig.h */makefile.msc.in : updated [and finally fixed my
script to produce ready to go de-in(ed) files, w/o autotools]
* */*.rc.in : updated copyrights to 2004
* glib/gutils.c : some CSIDL_* defines lacking from older SDK;
use the same fallback mecahnism as on *NIX where ever applicable
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/gobject.rc.in | 2 | ||||
| -rw-r--r-- | gobject/makefile.msc.in | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gobject/gobject.rc.in b/gobject/gobject.rc.in index b88dce5bd..0f489d345 100644 --- a/gobject/gobject.rc.in +++ b/gobject/gobject.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GObject" VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" VALUE "InternalName", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik and Red Hat, Inc." + VALUE "LegalCopyright", "Copyright © 1998-2004 Tim Janik and Red Hat, Inc." VALUE "OriginalFilename", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index 2d06e60a4..54f99ff8b 100644 --- a/gobject/makefile.msc.in +++ b/gobject/makefile.msc.in @@ -21,8 +21,7 @@ all : \ gobject-query.exe \ libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll \ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ - testgobject.exe \ - testoverride.exe + testgobject.exe gobject_OBJECTS = \ gboxed.obj \ @@ -41,6 +40,16 @@ gobject_OBJECTS = \ gvaluetypes.obj \ gvaluetransform.obj +gobjectalias.h: gobject.symbols + perl makegobjectalias.pl < gobject.symbols > gobjectalias.h + +gobject.def: gobject.symbols + echo EXPORTS > gobject.def + cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gobject.symbols >> gobject.def + +gobject.res : gobject.rc + rc -DBUILDNUMBER=0 -r -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 @@ -51,8 +60,8 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c -libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def - $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \ +libgobject-2.0-@LT_CURRENT_MINUS_AGE@.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 gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) @@ -61,7 +70,7 @@ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) # link glib's static version to avoid installing glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ - ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) $(LIBICONV_LIBS) gobject-query.exe : gobject-query.c libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ |