X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fwin32%2Fmakefile.cygwin;h=5dbe79e65cf012e367d1549381d6a821fe0aa594;hb=45a3396064873cf248908a0d275caa342a3bc4c1;hp=86fbeb1e68d676ec7335924c3ff525384cb68f20;hpb=1c84483f3ee8559179b49a200d3cc6854e81b873;p=~andy%2Fgtk

diff --git a/gdk/win32/makefile.cygwin b/gdk/win32/makefile.cygwin
index 86fbeb1e6..5dbe79e65 100644
--- a/gdk/win32/makefile.cygwin
+++ b/gdk/win32/makefile.cygwin
@@ -15,7 +15,7 @@ OPTIMIZE = -g -O
 
 # Nothing much configurable below
 
-CC = gcc -mno-cygwin -mpentium
+CC = gcc -mno-cygwin -mpentium -fnative-struct
 
 CP = cp
 LD = ld
@@ -25,9 +25,11 @@ GLIB_VER=1.3
 GTK_VER=1.3
 
 GLIB = ../../../glib
-CFLAGS = -g -I. -I../.. -I$(WTKIT)/include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
+CFLAGS = $(OPTIMIZE) -I . -I ../.. -I $(WTKIT)/include -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DNEAR= -DFAR=
 
 all: \
+	gdk/gdkprivate.h \
+	gdk/gdkx.h	\
 	../../config.h	\
 	gdk-$(GTK_VER).dll
 
@@ -58,6 +60,26 @@ gdk_OBJECTS = \
 	gdkwindow.o	\
 	gdkxid.o
 
+# We must have copies of gdkx.h and gdkprivate.h in the gdk
+# subdirectory, so that application sources which want to be
+# compilable with both GTk+ 1.2 (where there are no separate backend
+# gdk directories) and this 1.3 version (where the Win32 backend is in
+# the directory of *this* file you are reading right now) can use
+# #include <gdk/gdkprivate.h>.
+
+# Applications that depend on GTk+ 1.3 or later should include
+# gdkprivate.h and gdkx.h without the gdk/ prefix. The CFLAGS should
+# include an -I switch pointing to the backend-specific directory
+# (*this* directory in the Win32 case).
+
+gdk/gdkprivate.h : gdkprivate.h
+	-mkdir gdk
+	cp gdkprivate.h gdk
+
+gdk/gdkx.h : gdkx.h
+	-mkdir gdk
+	cp gdkx.h gdk
+
 ../../config.h : ../../config.h.win32
 	$(CP) ../../config.h.win32 ../../config.h
 
@@ -79,11 +101,5 @@ gdkrgb.c : ../gdkrgb.c
 gdkrectangle.c : ../gdkrectangle.c
 	$(CP) ../gdkrectangle.c .
 
-testgdk.exe : testgdk.o gdk-$(GTK_VER).dll
-	$(CC) $(CFLAGS) -o $@ testgdk.o -L . -lgdk-$(GTK_VER) -L $(GLIB) -lglib-$(GLIB_VER) $(LDFLAGS)
-
-testgdk.o : testgdk.c
-	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgdk\" testgdk.c
-
 clean:
 	-rm *.exe *.o *.dll *.a *.exp *.base