link with ws2_32.lib

2005-08-20  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in : link with ws2_32.lib

diff --git a/ChangeLog b/ChangeLog
index 04a029c..cfae14e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-20  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : link with ws2_32.lib
+
 2005-08-18  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Check for <sys/wait.h>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 04a029c..cfae14e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-08-20  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : link with ws2_32.lib
+
 2005-08-18  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Check for <sys/wait.h>

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 04a029c..cfae14e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2005-08-20  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : link with ws2_32.lib
+
 2005-08-18  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Check for <sys/wait.h>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 04a029c..cfae14e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2005-08-20  Hans Breuer  <hans@breuer.org>
+
+       * glib/makefile.msc.in : link with ws2_32.lib
+
 2005-08-18  Tor Lillqvist  <tml@novell.com>
 
        * configure.in: Check for <sys/wait.h>

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index f1d87b9..5c890d4 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -17,8 +17,8 @@ all :                         \
        galias.h                \
        galiasdef.c             \
        gnulib\gnulib.lib       \
-       libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
-       glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
+       libglib-2.0-0.dll \
+       glib-2.8s.lib \
        gspawn-win32-helper.exe \
 
 
@@ -109,9 +109,10 @@ glib.res : glib.rc
 glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnulib.lib
        lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib
 
-libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def glib.res
+libglib-2.0-0.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def glib.res
        $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(LIBICONV_LIBS) $(INTL_LIBS) \
-       gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def
+       gnulib\gnulib.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
 
 gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
        $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib