pthread isn't required anymore

2001-05-24  Hans Breuer  <hans@breuer.org>

	* makefile.msc.in : pthread isn't required anymore
This commit is contained in:
Hans Breuer 2001-05-24 16:36:47 +00:00 committed by Hans Breuer
parent c990a0c4c6
commit 81cd6c9f6c
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2001-05-24 Hans Breuer <hans@breuer.org>
* makefile.msc.in : pthread isn't required anymore
2001-05-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread-win32.c (g_cond_wait_internal): Also return TRUE for

View File

@ -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@, <makefile.msc.in >$@
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