x11: Export GdkX11Cursor

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

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index fb61c32a2d80ee7b93c93f40eb1496ceada95e6c..49c597861030a633e0db577bdd0684cf31d139b3 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -18,22 +18,6 @@ WTKIT = $(TOP)\wtkit126
 ###############################################################
 
 # Nothing much configurable below
-
-!IFNDEF DEBUG
-# Full optimization:
-OPTIMIZE = -Ox -MD -Zi
-LINKDEBUG = /nodefaultlib:libc.lib
-!ELSE
-# Debugging:
-OPTIMIZE = -Zi -MDd
-LINKDEBUG = /nodefaultlib:libcd.lib /nodefaultlib:libc.lib /debug
-!ENDIF
-
-# cl -? describes the options
-CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
-
-LDFLAGS = /link $(LINKDEBUG)
-
 # overwrite version?
 GTK_VER=2.0
 GDK_PIXBUF_VER=$(GTK_VER)
@@ -42,17 +26,21 @@ GDK_PIXBUF_VER=$(GTK_VER)
 PERL = perl
 !ENDIF
 
-CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
+INCLUDES = -FImsvc_recommended_pragmas.h \
+       -I . -I .. \
        $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) -I ../gdk-pixbuf \
-       $(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \
+
+DEFINES = \
+       -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN \
        -DGDK_VERSION=\"$(GTK_VER)\" \
-       -DG_LOG_DOMAIN=\"Gdk\"
+       -DG_LOG_DOMAIN=\"Gdk\" \
+       -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\"
 
 EXTRALIBS = \
        $(WTKIT)\lib\i386\wntab32x.lib \
        $(GLIB_LIBS) \
        ..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
-       $(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
+       $(PANGOWIN32_LIBS) $(PANGOCAIRO_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
        $(PANGOCAIRO_LIBS)
 
 gdk-win32-backend :
@@ -63,8 +51,6 @@ gdk-win32-backend :
 all: \
        ..\config.h \
        gdkconfig.h \
-       gdkalias.h \
-       gdkaliasdef.c \
        gdkenumtypes.h \
        gdkenumtypes.c \
        gdkmarshalers.h \
@@ -87,21 +73,18 @@ gdk_OBJECTS = \
        gdkdraw.obj \
        gdkenumtypes.obj \
        gdkevents.obj \
-       gdkfont.obj \
        gdkgc.obj \
        gdkglobals.obj \
-       gdkimage.obj \
+       gdkwindowimpl.obj \
        gdkkeynames.obj \
        gdkkeys.obj \
        gdkkeyuni.obj \
+       gdkmarshalers.obj \
+       gdkoffscreenwindow.obj \
        gdkpango.obj \
        gdkpixbuf-drawable.obj \
        gdkpixbuf-render.obj \
-       gdkpixmap.obj \
-       gdkpolyreg-generic.obj \
        gdkrectangle.obj \
-       gdkregion-generic.obj \
-       gdkrgb.obj \
        gdkscreen.obj \
        gdkselection.obj \
        gdkvisual.obj \
@@ -114,19 +97,13 @@ gdk_public_h_sources = \
        gdkdnd.h        \
        gdkdrawable.h   \
        gdkevents.h     \
-       gdkfont.h       \
        gdkgc.h         \
        gdkkeysyms.h    \
-       gdki18n.h       \
-       gdkimage.h      \
        gdkinput.h      \
        gdkkeys.h       \
        gdkpango.h      \
        gdkpixbuf.h     \
-       gdkpixmap.h     \
        gdkproperty.h   \
-       gdkregion.h     \
-       gdkrgb.h        \
        gdkselection.h  \
        gdktypes.h      \
        gdkvisual.h     \
@@ -134,10 +111,10 @@ gdk_public_h_sources = \
 
 # private marshalers
 gdkmarshalers.h : gdkmarshalers.list
-       $(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --header >>gdkmarshalers.h
+       $(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
+       $(GLIB)\gobject\glib-genmarshal --prefix=_gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
 
 gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
        $(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \
@@ -153,15 +130,9 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
 gdkconfig.h : gdkconfig.h.win32
        copy gdkconfig.h.win32 gdkconfig.h
 
-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 \
+       cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \
                -DG_GNUC_CONST= \
                gdk.symbols >> gdk.def
 
@@ -181,9 +152,6 @@ gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
 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