glib r6445 - in trunk: . glib gobject

[hans svn gnome org]

Author: hans
Date: Sun Feb  3 22:41:06 2008
New Revision: 6445
URL: http://svn.gnome.org/viewvc/glib?rev=6445&view=rev

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

	* **/makefile.msc.in : update



Modified:
   trunk/ChangeLog
   trunk/glib/makefile.msc.in
   trunk/gobject/makefile.msc.in

Modified: trunk/glib/makefile.msc.in
==============================================================================
--- trunk/glib/makefile.msc.in	(original)
+++ trunk/glib/makefile.msc.in	Sun Feb  3 22:41:06 2008
@@ -9,7 +9,7 @@
 
 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ..
 DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG -DPCRE_STATIC
-DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS)
+DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(DIRENT_CFLAGS)
 
 all :				\
 	..\config.h		\
@@ -126,7 +126,7 @@
 	lib /out:glib- GLIB_MAJOR_VERSION@  GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib
 
 libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib pcre\pcre.lib glib.def glib.res
-	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(LIBICONV_LIBS) $(INTL_LIBS) \
+	$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(INTL_LIBS) \
 	gnulib\gnulib.lib pcre\pcre.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib ws2_32.lib \
 	$(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
 

Modified: trunk/gobject/makefile.msc.in
==============================================================================
--- trunk/gobject/makefile.msc.in	(original)
+++ trunk/gobject/makefile.msc.in	Sun Feb  3 22:41:06 2008
@@ -77,11 +77,11 @@
 # link glib's static version to avoid installing 
 glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
-	  \glib\glib- GLIB_MAJOR_VERSION@  GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
+	  \glib\glib- GLIB_MAJOR_VERSION@  GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) 
 
 gobject-query.exe : gobject-query.c libgobject-2 0- LT_CURRENT_MINUS_AGE@.dll
 	$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \
-	..\glib\glib-2.0.lib gobject-2.0.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS)
+	..\glib\glib-2.0.lib gobject-2.0.lib user32.lib advapi32.lib $(INTL_LIBS)
 
 gmarshal.strings : gmarshal.list
 	perl marshal-genstrings.pl > gmarshal.strings