Update.

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

diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index d384967ffc6827d188e5d63180f3229771688b72..1b4bed306314b60442adb663acaaf8eea5614141 100644 (file)
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -8,6 +8,9 @@ WTKIT = ..\..\..\wtkit126
 
 # Nothing much configurable below
 
+TOP = ../../..
+!INCLUDE $(TOP)/build/win32/make.msc
+
 !IFNDEF DEBUG
 # Full optimization:
 OPTIMIZE = -Ox -MD
@@ -21,11 +24,9 @@ CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
 
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 
-GLIB_VER=1.3
 GTK_VER=1.3
 
-GLIB = ..\..\..\glib
-CFLAGS = -I. -I.. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
+CFLAGS = -I. -I.. -I..\.. $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
 
 all: \
        ..\..\config.h  \
@@ -46,13 +47,13 @@ gdk_win32_OBJECTS = \
        gdkglobals-win32.obj \
        gdkim-win32.obj \
        gdkimage-win32.obj \
+       gdkinput.obj \
        gdkinput-win32.obj \
        gdkmain-win32.obj \
+       gdkpango-win32.obj \
        gdkpixmap-win32.obj \
        gdkproperty-win32.obj \
-       gdkregion-win32.obj \
-       gdkpolyreg-generic.obj \
-       gdkregion-generic.obj \
+#      gdkregion-win32.obj \
        gdkselection-win32.obj \
        gdkvisual-win32.obj \
        gdkwin32id.obj \
@@ -64,21 +65,6 @@ gdk_win32_OBJECTS = \
 ..\gdkconfig.h : ..\gdkconfig.h.win32
        copy ..\gdkconfig.h.win32 ..\gdkconfig.h
 
-gdkregion-generic.c: ..\x11\gdkregion-generic.c
-       copy ..\x11\gdkregion-generic.c gdkregion-generic.c
-
-gdkpolyreg-generic.c: ..\x11\gdkpolyreg-generic.c
-       copy ..\x11\gdkpolyreg-generic.c gdkpolyreg-generic.c
-
-gdkregion-generic.h: ..\x11\gdkregion-generic.h
-       copy ..\x11\gdkregion-generic.h gdkregion-generic.h
-
-gdkpoly-generic.h: ..\x11\gdkpoly-generic.h
-       copy ..\x11\gdkpoly-generic.h gdkpoly-generic.h
-
-gdkgc-win32.o:: gdkregion-generic.h
-gdkpolyreg-generic.o:: gdkpoly-generic.h
-
 gdk.res : rc\gdk.rc
        rc -DBUILDNUMBER=0 -r -fo gdk.res rc\gdk.rc