X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gthread%2Fmakefile.msc.in;h=226bf9cd87f39d475934b17bdd1c4cf30a4356e3;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=a4547c13bd791b66fcff9185605ee2b7dec30e91;hpb=606033cffa3422426a25829586aaf326731c2d0f;p=platform%2Fupstream%2Fglib.git

diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index a4547c1..226bf9c 100644
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -1,35 +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 $(TOP)\build\win32\make.msc
-
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
-# Nothing much configurable below
-
-INCLUDES = -I .. -I . -I ..\glib
+INCLUDES = -FImsvc_recommended_pragmas.h -I .. -I . -I ..\glib
 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
-# DEPCFLAGS = $(PTHREAD_CFLAGS)
-# DEPCLIBS = $(PTHREAD_LIBS) 
 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-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def
-	$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib\glib-$(GLIB_VER).lib $(DEPCLIBS) $(LDFLAGS) /def:gthread.def
+
+gthread.res : gthread.rc
+	rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc
+
+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