hook gvariant vectors up to kdbus

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

diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index d2ce4d1..431dd50 100644 (file)
--- a/gmodule/makefile.msc.in
+++ b/gmodule/makefile.msc.in
@@ -3,50 +3,35 @@
 
 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=\"GModule\"
 
 all : \
        gmoduleconf.h \
-       gmodule-$(GLIB_VER).dll \
-       testgmodule.exe
+       libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
 
 gmodule_OBJECTS = \
        gmodule.obj
+gmodule.def: gmodule.symbols\r
+       echo EXPORTS > gmodule.def\r
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \\r
+               -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \\r
+               -DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def\r
+\r
 
 gmoduleconf.h: gmoduleconf.h.win32
        copy gmoduleconf.h.win32 gmoduleconf.h
 
-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 >$@
-
-gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) 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-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console 
-
-libgplugin_a.dll : libgplugin_a.obj
-       $(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib \
-       ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+gmodule.res : gmodule.rc
+       rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc
 
-libgplugin_b.dll : libgplugin_b.obj
-       $(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib \
-       ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
+libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res
+       $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \
+       ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def
 
 clean::
        del gmoduleconf.h