GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 1a5e888b authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Hardcode 2.0 in the names, as that is what Makefile.am does.

2002-11-21  Tor Lillqvist  <tml@iki.fi>

	* {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
	Hardcode 2.0 in the names, as that is what Makefile.am does.
parent b99692c0
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
* glib/glib.rc.in * glib/glib.rc.in
* gmodule/gmodule.rc.in * gmodule/gmodule.rc.in
* gobject/gobject.rc.in * gobject/gobject.rc.in
* gthread/gthread.rc.in: Hardcode 2.0 in the names, as that is * gthread/gthread.rc.in
what the Makefile.am does. * {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Matthias Clasen <maclas@gmx.de> 2002-11-21 Matthias Clasen <maclas@gmx.de>
......
...@@ -18,7 +18,7 @@ DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS) ...@@ -18,7 +18,7 @@ DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
all : \ all : \
../config.h \ ../config.h \
../glibconfig.h \ ../glibconfig.h \
libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a \ libglib-2.0.a \
gspawn-win32-helper.exe gspawn-win32-helper.exe
glib_OBJECTS = \ glib_OBJECTS = \
...@@ -80,11 +80,11 @@ localcharset.c : libcharset/localcharset.c ...@@ -80,11 +80,11 @@ localcharset.c : libcharset/localcharset.c
################ The glib DLL ################ The glib DLL
libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(glib_OBJECTS) glib.def glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc libglib-2.0.a : $(glib_OBJECTS) glib.def glib-2.0.rc
$(BUILD_DLL) glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32 $(BUILD_DLL) glib-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : glib.rc glib-2.0.rc : glib.rc
cp $< $@ cp $< $@
gspawn-win32-helper.exe : gspawn-win32-helper.c gspawn-win32-helper.exe : gspawn-win32-helper.c
$(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-2.0
...@@ -14,7 +14,7 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS) ...@@ -14,7 +14,7 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS)
all : \ all : \
..\config.h \ ..\config.h \
..\glibconfig.h \ ..\glibconfig.h \
libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll \ libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
gspawn-win32-helper.exe \ gspawn-win32-helper.exe \
...@@ -78,14 +78,15 @@ localcharset.c : libcharset/localcharset.c ...@@ -78,14 +78,15 @@ localcharset.c : libcharset/localcharset.c
################ glib ################ glib
# create a static libary # create a static libary
# static library can well have the real version number in the name
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS)
lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS)
libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def
$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) $(DIRENT_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /implib:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:glib.def $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) $(DIRENT_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /subsystem:windows user32.lib $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib
################ other stuff ################ other stuff
......
...@@ -16,7 +16,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG ...@@ -16,7 +16,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG
all : \ all : \
gmoduleconf.h \ gmoduleconf.h \
libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a libgmodule-2.0.a
gmodule_OBJECTS = \ gmodule_OBJECTS = \
gmodule.o gmodule.o
...@@ -26,10 +26,10 @@ gmoduleconf.h: gmoduleconf.h.win32 ...@@ -26,10 +26,10 @@ gmoduleconf.h: gmoduleconf.h.win32
################ The gmodule DLL ################ The gmodule DLL
libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gmodule_OBJECTS) gmodule.def gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc libgmodule-2.0.a : $(gmodule_OBJECTS) gmodule.def gmodule-2.0.rc
$(BUILD_DLL) gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(BUILD_DLL) gmodule-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-2.0
gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gmodule.rc gmodule-2.0.rc : gmodule.rc
cp $< $@ cp $< $@
################ Other stuff ################ Other stuff
......
...@@ -12,7 +12,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" ...@@ -12,7 +12,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\"
all : \ all : \
gmoduleconf.h \ gmoduleconf.h \
libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
gmodule_OBJECTS = \ gmodule_OBJECTS = \
gmodule.obj gmodule.obj
...@@ -20,9 +20,9 @@ gmodule_OBJECTS = \ ...@@ -20,9 +20,9 @@ gmodule_OBJECTS = \
gmoduleconf.h: gmoduleconf.h.win32 gmoduleconf.h: gmoduleconf.h.win32
copy gmoduleconf.h.win32 gmoduleconf.h copy gmoduleconf.h.win32 gmoduleconf.h
libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def
$(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \ $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \
..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /implib:gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gmodule.def ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
clean:: clean::
del gmoduleconf.h del gmoduleconf.h
...@@ -17,7 +17,7 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" ...@@ -17,7 +17,7 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\"
srcdir=. srcdir=.
all : \ all : \
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a \ libgobject-2.0.a \
testgobject.exe \ testgobject.exe \
glib-genmarshal.exe glib-genmarshal.exe
...@@ -38,14 +38,17 @@ gobject_OBJECTS = \ ...@@ -38,14 +38,17 @@ gobject_OBJECTS = \
gvaluetransform.o \ gvaluetransform.o \
gvaluetypes.o gvaluetypes.o
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(srcdir)/stamp-gmarshal.h gmarshal.c $(gobject_OBJECTS) gobject.def libgobject-2.0.a : $(srcdir)/stamp-gmarshal.h gmarshal.c $(gobject_OBJECTS) gobject.def gobject-2.0.rc
$(BUILD_DLL) gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gobject.def $(gobject_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(BUILD_DLL) gobject-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gobject.def $(gobject_OBJECTS) -L ../glib -lglib-2.0
glib-genmarshal.exe : glib-genmarshal.c glib-genmarshal.exe : glib-genmarshal.c
$(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L ../glib -lglib-2.0
testgobject.exe: libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a testgobject.o testgobject.exe: libgobject-2.0.a testgobject.o
$(CC) $(CFLAGS) -o testgobject.exe testgobject.o -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ -L . -lgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(LFLAGS) $(CC) $(CFLAGS) -o testgobject.exe testgobject.o -L ../glib -lglib-2.0 -L . -lgobject-2.0 $(LFLAGS)
gobject-2.0.rc : gobject.rc
cp $< $@
# Copied from Makefile.am: # Copied from Makefile.am:
# initial creation of the real stamp-* files # initial creation of the real stamp-* files
......
...@@ -5,13 +5,8 @@ TOP = ..\.. ...@@ -5,13 +5,8 @@ TOP = ..\..
!INCLUDE ..\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
# Possibly override GLib version in build\win32\object.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below
INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" \
-DG_ENABLE_DEBUG -DG_ENABLE_DEBUG
...@@ -24,7 +19,7 @@ all : \ ...@@ -24,7 +19,7 @@ all : \
gmarshal.c \ gmarshal.c \
gmarshal.strings \ gmarshal.strings \
gobject-query.exe \ gobject-query.exe \
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll \ libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll \
gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
testgobject.exe \ testgobject.exe \
testoverride.exe testoverride.exe
...@@ -56,9 +51,9 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe ...@@ -56,9 +51,9 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe
gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe
glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c
libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def
$(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \ $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \
..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /implib:gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gobject.def ..\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) gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS)
lib /out:$@ $(gobject_OBJECTS) lib /out:$@ $(gobject_OBJECTS)
...@@ -68,13 +63,13 @@ glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings ...@@ -68,13 +63,13 @@ glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ $(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 $(INTL_LIBS) $(LIBICONV_LIBS)
gobject-query.exe : gobject-query.c libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll gobject-query.exe : gobject-query.c libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \
..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) ..\glib\glib-2.0.lib gobject-2.0.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
gmarshal.strings : gmarshal.list gmarshal.strings : gmarshal.list
perl marshal-genstrings.pl > gmarshal.strings perl marshal-genstrings.pl > gmarshal.strings
.c.exe : .c.exe :
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
$(CC) $(CFLAGS) -Fe$@ $< gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gthread\gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) user32.lib /subsystem:console $(CC) $(CFLAGS) -Fe$@ $< gobject-2.0.lib ..\glib\glib-2.0.lib ..\gmodule\gmodule-2.0.lib $(LDFLAGS) user32.lib /subsystem:console
...@@ -9,19 +9,17 @@ include ../build/win32/make.mingw ...@@ -9,19 +9,17 @@ include ../build/win32/make.mingw
################################################################ ################################################################
# Nothing much configurable below
INCLUDES = -I .. -I ../glib -I . INCLUDES = -I .. -I ../glib -I .
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG
all : \ all : \
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a libgthread-2.0.a
gthread_OBJECTS = \ gthread_OBJECTS = \
gthread-impl.o gthread-impl.o
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gthread_OBJECTS) gthread.def gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc libgthread-2.0.a : $(gthread_OBJECTS) gthread.def gthread-2.0.rc
$(BUILD_DLL) gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ $(BUILD_DLL) gthread-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-2.0
gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gthread.rc gthread-2.0.rc : gthread.rc
cp $< $@ cp $< $@
## Makefile for building the gthread dll with Microsoft C ## Makefile for building the gthread dll with Microsoft C
## Use: nmake -f makefile.msc install ## Use: nmake -f makefile.msc install
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ..\.. TOP = ..\..
!INCLUDE ..\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
...@@ -12,7 +10,7 @@ TOP = ..\.. ...@@ -12,7 +10,7 @@ TOP = ..\..
INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
all : \ all : \
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
gthread_OBJECTS = \ gthread_OBJECTS = \
gthread-impl.obj gthread-impl.obj
...@@ -20,5 +18,5 @@ gthread_OBJECTS = \ ...@@ -20,5 +18,5 @@ gthread_OBJECTS = \
gthread-impl.obj : gthread-impl.c gthread-win32.c gthread-impl.obj : gthread-impl.c gthread-win32.c
$(CC) -c $(CFLAGS) gthread-impl.c $(CC) -c $(CFLAGS) gthread-impl.c
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def
$(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gthread.def $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment