update

2008-02-03  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc.in : update

svn path=/trunk/; revision=6445

diff --git a/ChangeLog b/ChangeLog
index f2334059304e7abe723ce023d559c8916054e707..f7846de40362869cd745700b0f7d3f787cc8f48a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-03  Hans Breuer  <hans@breuer.org>
+
+       * **/makefile.msc.in : update
+
 2008-02-03  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * configure.in: Check for gmtime_r. Missing part of bug #511807.

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 50d175053ea3256a64cbf09eb54ccca43dab9ba5..ebaeff30862e00bf6b2cfdecba5b21b3e2917411 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -9,7 +9,7 @@ TOP = ..\..
 
 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 @@ glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnu
        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
 

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index d04b33c9a1562a1f5f6e408f999910c8d653ba88..f5182327ad4edfef5e4029b2a359c273bd607e62 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -77,11 +77,11 @@ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS)
 # 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