dia r3893 - in trunk: . lib

[hans svn gnome org]

Author: hans
Date: Mon Mar  3 10:51:15 2008
New Revision: 3893
URL: http://svn.gnome.org/viewvc/dia?rev=3893&view=rev

Log:
2008-03-03  Hans Breuer  <hans breuer org>

	* lib/makefile.msc : compile units.c and ensure definition of
	GLIB_GEN_MARSHAL



Modified:
   trunk/ChangeLog
   trunk/lib/makefile.msc

Modified: trunk/lib/makefile.msc
==============================================================================
--- trunk/lib/makefile.msc	(original)
+++ trunk/lib/makefile.msc	Mon Mar  3 10:51:15 2008
@@ -25,7 +25,8 @@
 	$(PANGOFT2_LIBS) \
 !ENDIF
 	$(LIBXML2_LIBS) $(ZLIB_LIBS) \
-	$(LIBART_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(LIBART_LIBS) \
+	$(GDK_PIXBUF_LIBS) \
 	$(INTL_LIBS)
 
 ICON_PNG_PAIRS = \
@@ -107,6 +108,7 @@
 	sheet.obj \
 	text.obj \
 	textline.obj \
+	units.obj \
 	utils.obj \
 	widgets.obj \
 	diamarshal.obj \
@@ -118,6 +120,10 @@
 gen_sources = xgen-gwmh xgen-gwmc
 CLEANFILES = $(gen_sources)
 
+!IFNDEF GLIB_GEN_MARSHAL
+GLIB_GEN_MARSHAL=$(TOP)\glib\gobject\glib-genmarshal
+!ENDIF
+
 diamarshal.h: diamarshal.list
 	$(GLIB_GEN_MARSHAL) --prefix=dia_marshal diamarshal.list --header >> xgen-gwmh \
 	&& copy /y xgen-gwmh diamarshal.h \