diff options
| -rw-r--r-- | gmodule/ChangeLog | 4 | ||||
| -rw-r--r-- | gmodule/makefile.msc.in | 18 | ||||
| -rw-r--r-- | gthread/ChangeLog | 4 | ||||
| -rw-r--r-- | gthread/makefile.msc.in | 6 |
4 files changed, 22 insertions, 10 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index c6c9f8faf..95ffbbf2c 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,7 @@ +2001-07-20 Hans Breuer <hans@breuer.org> + + * makefile.msc.in : reflect glib move + 2001-05-21 Mark Murnane <Mark.Murnane@ireland.sun.com> * gmodule.c (g_str_check_suffix): Modified type of string_len diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in index 47b3c0e6f..d2ce4d185 100644 --- a/gmodule/makefile.msc.in +++ b/gmodule/makefile.msc.in @@ -3,7 +3,7 @@ TOP = ..\.. -!INCLUDE ..\build\win32\make.msc +!INCLUDE $(TOP)\build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @@ -12,8 +12,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ # Nothing much configurable below -INCLUDES = -I .. -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG +INCLUDES = -I .. -I . -I ..\glib +DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" all : \ gmoduleconf.h \ @@ -31,18 +31,22 @@ makefile.msc: makefile.msc.in -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@ gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def - $(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def + $(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) \ + ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def ################ test prog testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll - $(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console + $(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib \ + ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console libgplugin_a.dll : libgplugin_a.obj - $(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) + $(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib \ + ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) libgplugin_b.dll : libgplugin_b.obj - $(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) + $(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib \ + ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) clean:: del gmoduleconf.h diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 0ee89d990..f16e31449 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +2001-07-20 Hans Breuer <hans@breuer.org> + + * makefile.msc.in : reflect glib move + 2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * gthread-win32.c: Use g_win32_error_message to beautify error diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index 414b1e02a..a4547c13b 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -14,8 +14,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ # Nothing much configurable below -INCLUDES = -I .. -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG +INCLUDES = -I .. -I . -I ..\glib +DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" # DEPCFLAGS = $(PTHREAD_CFLAGS) # DEPCLIBS = $(PTHREAD_LIBS) all : \ @@ -32,4 +32,4 @@ gthread-impl.obj : gthread-impl.c gthread-win32.c $(CC) -c $(CFLAGS) gthread-impl.c gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def - $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def + $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def |