[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gthread / makefile.msc.in

diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index 5450af0..226bf9c 100644 (file)
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -1,32 +1,26 @@
 ## Makefile for building the gthread dll with Microsoft C
 ## Use: nmake -f makefile.msc install
 
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 TOP = ..\..
 
 !INCLUDE ..\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
 ################################################################
 
-# Nothing much configurable below
-
-INCLUDES = -I .. -I .
+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
-DEPCFLAGS = $(PTHREAD_CFLAGS)
-
 all : \
-       gthread-$(GLIB_VER).dll
+       libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 
 gthread_OBJECTS = \
        gthread-impl.obj
 
-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.res : gthread.rc
+       rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc
 
-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
+libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def gthread.res
+       $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \
+       ..\glib\glib-2.0.lib $(DEPCLIBS) user32.lib $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def