new file to build it all ... added to EXTRA_DIST

2003-07-20  Hans Breuer  <hans@breuer.org>

	* makefile.msc : new file to build it all
	* Makefile.am : ... added to EXTRA_DIST

	* gdk/makefile.msc gtk/stock-icons/makefile.msc
	  gtk/makefile.msc.in tests/makefile.msc : updated

	* gdk/gdk.def gtk/gtk.def : export a bunch of new
	functions

	* gtk/gtkbbox.c : use g_return_val_if_fail() if
	there is a value to return

	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
	static correctness

	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR

	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES

	* gtk/gtkimmulticontext.c : use gtkprivate.h

	* gtk/stock-icons/stock_color_picker_25.png
	  gtk/stock-icons/stock_jump_to_rtl_16.png
	  gtk/stock-icons/stock_jump_to_rtl_24.png
	  gtk/stock-icons/stock_redo_rtl_16.png
	  gtk/stock-icons/stock_redo_rtl_24.png
	  gtk/stock-icons/stock_undelete_rtl_16.png
	  gtk/stock-icons/stock_undelete_rtl_24.png
	  gtk/stock-icons/stock_undo_rtl_16.png :
	  gtk/stock-icons/stock_undo_rtl_24.png :
	readded as binary

1 files changed, 23 insertions, 6 deletions

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 43585424c3..cf20dcf5f0 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -6,7 +6,7 @@
 ## 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.
@@ -44,7 +44,8 @@ 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)
+		..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
+		$(PANGOWIN32_LIBS) $(INTL_LIBS)
 
 gdk-win32-backend :
 	cd win32
@@ -56,8 +57,10 @@ all: \
 	gdkconfig.h \
 	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 \
@@ -67,6 +70,8 @@ gdk_OBJECTS = \
 	gdkcolor.obj \
 	gdkcursor.obj \
 	gdkdisplay.obj \
+	gdkdisplaymanager.obj \
+	gdkdnd.obj \
 	gdkdraw.obj \
 	gdkenumtypes.obj \
 	gdkevents.obj \
@@ -74,6 +79,7 @@ gdk_OBJECTS = \
 	gdkgc.obj \
 	gdkglobals.obj \
 	gdkimage.obj \
+	gdkkeynames.obj \
 	gdkkeys.obj \
 	gdkkeyuni.obj \
 	gdkpango.obj \
@@ -114,6 +120,13 @@ gdk_public_h_sources = \
 	gdkvisual.h	\
 	gdkwindow.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.h: $(gdk_public_h_sources) makeenums.pl
 	$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
 
@@ -126,8 +139,10 @@ 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
+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 +152,15 @@ 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::
+	del gdkmarshalers.c
+	del gdkmarshalers.h
 	del *.dll
 	del *.obj
 	del *.lib