From 81cd6c9f6ce372032bba002522c782f6d6fff952 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Thu, 24 May 2001 16:36:47 +0000 Subject: [PATCH] pthread isn't required anymore 2001-05-24 Hans Breuer * makefile.msc.in : pthread isn't required anymore --- gthread/ChangeLog | 4 ++++ gthread/makefile.msc.in | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 409f274..53af352 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +2001-05-24 Hans Breuer + + * makefile.msc.in : pthread isn't required anymore + 2001-05-22 Sebastian Wilhelmi * gthread-win32.c (g_cond_wait_internal): Also return TRUE for diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index 0e5aab6..414b1e0 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -5,7 +5,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ 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@ @@ -16,8 +16,8 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ INCLUDES = -I .. -I . DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG -DEPCFLAGS = $(PTHREAD_CFLAGS) - +# DEPCFLAGS = $(PTHREAD_CFLAGS) +# DEPCLIBS = $(PTHREAD_LIBS) all : \ gthread-$(GLIB_VER).dll @@ -28,5 +28,8 @@ makefile.msc: makefile.msc.in $(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \ -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, $@ +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 $(PTHREAD_LIBS) $(LDFLAGS) /def:gthread.def + $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def -- 2.7.4