Remove deprecated code from GdkDnd

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

diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index ce79923ef5d764b0ebd2e90dfa65e8a6334a832e..5a4fa418f39f1c89bc0cfffb660f98588c82e6dd 100644 (file)
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -1,9 +1,6 @@
 ## Makefile for building the GDK DLL with Microsoft C
 ## Use: nmake -f makefile.msc
 
-# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
-WTKIT = ..\..\..\wtkit126
-
 ################################################################
 
 # Nothing much configurable below
@@ -11,12 +8,21 @@ WTKIT = ..\..\..\wtkit126
 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.
+!IFNDEF WTKIT
+WTKIT = $(TOP)\wtkit126
+!ENDIF
+
 GTK_VER=2.0
 
-CFLAGS = -FImsvc_recommended_pragmas.h \
+DEFINES = \
+       -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\" \
+       -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\"
+
+INCLUDES = -FImsvc_recommended_pragmas.h \
        -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) \
        -I$(WTKIT)\include -I$(GLIB) \
-       $(G_DEBUGGING) -DHAVE_CONFIG_H -DINSIDE_GDK_WIN32 -DGDK_VERSION=\"$(GTK_VER)\"
 
 all: \
        ..\..\config.h  \
@@ -25,6 +31,7 @@ all: \
        gdk.res
 
 gdk_win32_OBJECTS = \
+       gdkapplaunchcontext-win32.obj \
        gdkcolor-win32.obj \
        gdkcursor-win32.obj \
        gdkdnd-win32.obj \
@@ -47,6 +54,7 @@ gdk_win32_OBJECTS = \
        gdkscreen-win32.obj \
        gdkselection-win32.obj \
        gdkspawn-win32.obj \
+       gdktestutils-win32.obj \
        gdkvisual-win32.obj \
        gdkwin32id.obj \
        gdkwindow-win32.obj
@@ -63,9 +71,6 @@ gdk.res : rc\gdk.rc
 gdk-win32.lib : $(gdk_win32_OBJECTS)
        lib -out:gdk-win32.lib $(gdk_win32_OBJECTS)
 
-.c.obj :
-       $(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
-
 clean::
        del *.obj
        del *.lib