Fix for MSVC build: Skip strtod-test, use correct glib libraries, with 2.0

2003-11-15  Tor Lillqvist  <tml@iki.fi>

	* tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
	correct glib libraries, with 2.0 in the names. (#126906, John
	Ehresman)

diff --git a/ChangeLog b/ChangeLog
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 146728d..c179bc0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/makefile.msc.in: Fix for MSVC build: Skip strtod-test, use
+       correct glib libraries, with 2.0 in the names. (#126906, John
+       Ehresman)
+
 Sat Nov 15 00:46:14 2003  Matthias Clasen  <maclas@gmx.de>
 
        * configure.in: Don't blindly set glib_cv_long_long_format to

diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index 3dcda2d..6feb47c 100644 (file)
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -39,7 +39,8 @@ TESTS = \
 # strfunc-test doesn't compile with MSVC
 #      strfunc-test.exe\
        string-test.exe \
-       strtod-test.exe \
+# strtod-test doesn't either
+#      strtod-test.exe \
        thread-test.exe \
        threadpool-test.exe\
        tree-test.exe   \
@@ -56,13 +57,13 @@ all :       $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
 
 .c.exe :
        $(CC) $(CFLAGS) -c $<
-       $(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\gthread\gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) user32.lib /subsystem:console
+       $(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-2.0.lib ..\gmodule\gmodule-2.0.lib ..\gthread\gthread-2.0.lib $(LDFLAGS) user32.lib /subsystem:console
 
 libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
-       $(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
+       $(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-2.0.lib ..\glib\glib-2.0.lib $(LDFLAGS)
 
 libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
-       $(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS)
+       $(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-2.0.lib ..\glib\glib-2.0.lib $(LDFLAGS)
 
 check: all
        for %p in ($(TESTS)) do set PATH=..\glib;..\gmodule;..\gobject;..\gthread;%PATH% && %p