Updated msvc build

[~andy/gtk] / gdk / makefile.msc

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 43585424c3b5120a477251f8ef388a38b16f08ea..5e4d55d965f61409eaccef65f7059e01795101c5 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -6,12 +6,14 @@
 ## There is no install target, you have to decide where and 
 ## how to install for yourself.
 
-TOP = ../..
+TOP = ..\..
 !INCLUDE $(TOP)/glib/build/win32/make.msc
 
 # Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
 # definition should possibly go to build/win32/module.def, too.
-WTKIT = ..\..\wtkit126
+!IFNDEF WTKIT
+WTKIT = $(TOP)\wtkit126
+!ENDIF
 
 ###############################################################
 
@@ -41,10 +43,17 @@ PERL = perl
 !ENDIF
 
 CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
-               $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
-               $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\"
-EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
-               ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS)
+       $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) -I ../gdk-pixbuf \
+       $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \
+       -DGDK_VERSION=\"$(GTK_VER)\" \
+       -DG_LOG_DOMAIN=\"Gdk\"
+
+EXTRALIBS = \
+       $(WTKIT)\lib\i386\wntab32x.lib \
+       $(GLIB_LIBS) \
+       ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
+       $(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
+       $(PANGOCAIRO_LIBS)
 
 gdk-win32-backend :
        cd win32
@@ -54,19 +63,27 @@ gdk-win32-backend :
 all: \
        ..\config.h \
        gdkconfig.h \
+       gdkalias.h \
+       gdkaliasdef.c \
        gdkenumtypes.h \
        gdkenumtypes.c \
+       gdkmarshalers.h \
+       gdkmarshalers.c \
        gdk-win32-backend \
-       gdk-win32-$(GTK_VER).dll \
+       libgdk-win32-$(GTK_VER)-0.dll \
        testgdk.exe \
        gdk-win32-$(GTK_VER)s.lib \
 #      gdk-x11-$(GTK_VER).dll \
 
 gdk_OBJECTS = \
        gdk.obj \
+       gdkapplaunchcontext.obj \
+       gdkcairo.obj \
        gdkcolor.obj \
        gdkcursor.obj \
        gdkdisplay.obj \
+       gdkdisplaymanager.obj \
+       gdkdnd.obj \
        gdkdraw.obj \
        gdkenumtypes.obj \
        gdkevents.obj \
@@ -74,6 +91,8 @@ gdk_OBJECTS = \
        gdkgc.obj \
        gdkglobals.obj \
        gdkimage.obj \
+       gdkwindowimpl.obj \
+       gdkkeynames.obj \
        gdkkeys.obj \
        gdkkeyuni.obj \
        gdkpango.obj \
@@ -114,11 +133,20 @@ gdk_public_h_sources = \
        gdkvisual.h     \
        gdkwindow.h     \
 
-gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
-       $(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
+# private marshalers
+gdkmarshalers.h : gdkmarshalers.list
+       $(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --header >>gdkmarshalers.h
+
+gdkmarshalers.c : gdkmarshalers.list
+       $(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
 
-gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
-       $(PERL) makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
+gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
+       $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \
+               $(gdk_public_h_sources) > gdkenumtypes.h
+
+gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
+       $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.c.template \
+               $(gdk_public_h_sources) > gdkenumtypes.c
 
 ..\config.h : ..\config.h.win32
        copy ..\config.h.win32 ..\config.h
@@ -126,8 +154,22 @@ gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
 gdkconfig.h : gdkconfig.h.win32
        copy gdkconfig.h.win32 gdkconfig.h
 
-gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
-       $(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
+gdkalias.h: gdk.symbols
+       perl makegdkalias.pl < gdk.symbols > gdkalias.h
+
+gdkaliasdef.c: gdk.symbols
+        perl makegdkalias.pl -def < gdk.symbols > gdkaliasdef.c
+
+gdk.def: gdk.symbols
+       echo EXPORTS > gdk.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 -DALL_FILES \
+               -DG_GNUC_CONST= \
+               gdk.symbols >> gdk.def
+
+libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
+       $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
+       gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \
+       $(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def
 
 gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
        lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
@@ -137,13 +179,18 @@ gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
        $(PANGO)\pango\pangox-$(PANGO_VER).lib \
        x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
 
-testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj
+testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj
        $(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
 
 .c.obj :
        $(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
 
 clean::
+       cd win32
+       nmake -f makefile.msc clean
+       cd ..
+       del gdkmarshalers.c
+       del gdkmarshalers.h
        del *.dll
        del *.obj
        del *.lib