removed -GD to compile with msvc9 (vs2008) with less complains

2007-12-09  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc glib/makefile.msc.in : removed -GD to compile
	with msvc9 (vs2008) with less complains

	* glibconfig.h.win32.in : #define G_HAVE_ISO_VARARGS 1 for
	msv8 (vs2005) and above

	* glib/gfileutils.c : s/stricmp/_stricmp/
	* msvc_recommended_pragmas.h : work around Microsoft's premature
	attempt to deprecate the C-Library

	* tests/makefile.msc.in : added checksum-test

svn path=/trunk/; revision=6076

diff --git a/ChangeLog b/ChangeLog
index 6f2364bea78eabe3a771978457a7cd173b877ed9..361f855d1741d9cbdcba11c0f3948f2932d8c9c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-12-09  Hans Breuer  <hans@breuer.org>
+
+       * **/makefile.msc glib/makefile.msc.in : removed -GD to compile
+       with msvc9 (vs2008) with less complains
+       
+       * glibconfig.h.win32.in : #define G_HAVE_ISO_VARARGS 1 for
+       msv8 (vs2005) and above
+       
+       * glib/gfileutils.c : s/stricmp/_stricmp/
+       * msvc_recommended_pragmas.h : work around Microsoft's premature 
+       attempt to deprecate the C-Library
+
+       * tests/makefile.msc.in : added checksum-test
+
 2007-12-08  Christian Persch  <chpe@gnome.org>
 
        * gio/glocalfileinfo.c: (get_thumbnail_attributes): Add forgotten

diff --git a/gio/makefile.msc b/gio/makefile.msc
index 5e3efd05602c436498f1bf93088ca14095183b98..d4e7b8dcc9af199550c1de6e8d20d178c9ea997d 100644 (file)
--- a/gio/makefile.msc
+++ b/gio/makefile.msc
@@ -254,4 +254,4 @@ libgio-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
        user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
 
 .c.obj :
-       $(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
+       $(CC) $(CFLAGS) -c $(PKG_CFLAGS) $<

diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index 89211884d8971c0c4488ecd32a57f214c93b3895..c11420d751b4fbd7fc6e8841eb8fbc5c40e2f8a3 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -221,10 +221,10 @@ g_file_test (const gchar *filename,
       if (lastdot == NULL)
        return FALSE;
 
-      if (stricmp (lastdot, ".exe") == 0 ||
-         stricmp (lastdot, ".cmd") == 0 ||
-         stricmp (lastdot, ".bat") == 0 ||
-         stricmp (lastdot, ".com") == 0)
+      if (_stricmp (lastdot, ".exe") == 0 ||
+         _stricmp (lastdot, ".cmd") == 0 ||
+         _stricmp (lastdot, ".bat") == 0 ||
+         _stricmp (lastdot, ".com") == 0)
        return TRUE;
 
       /* Check if it is one of the types listed in %PATHEXT% */

diff --git a/glib/gnulib/makefile.msc b/glib/gnulib/makefile.msc
index a8fc743c8e1943009dda084ae134732108635ea0..da2b4cfe1a1aa53d99936b29d7150377c05abc87 100644 (file)
--- a/glib/gnulib/makefile.msc
+++ b/glib/gnulib/makefile.msc
@@ -1,7 +1,7 @@
 TOP = ..\..\..
 !INCLUDE ..\..\build\win32\make.msc
 
-INCLUDES = -I ..\.. 
+INCLUDES = -I ..\.. -I ..
 DEFINES = -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT
 
 OBJECTS = \

diff --git a/glib/pcre/makefile.msc b/glib/pcre/makefile.msc
index a9306ad0936082be0e418d5cad7fc4b842d3c287..8939a7245b3a7686c6f99a701d9ad99b1a6445ae 100644 (file)
--- a/glib/pcre/makefile.msc
+++ b/glib/pcre/makefile.msc
@@ -18,11 +18,11 @@ DEFINES = \
        -DMAX_NAME_COUNT=10000 \
        -DMAX_DUPLENGTH=30000 \
        -DLINK_SIZE=2 \
-       -DEBCDIC=0 \
+       -UEBCDIC \
        -DPOSIX_MALLOC_THRESHOLD=10
 
 OBJECTS = \
-       \.obj \
+       pcre_chartables.obj \
        pcre_compile.obj \
        pcre_config.obj \
        pcre_dfa_exec.obj \
@@ -31,7 +31,6 @@ OBJECTS = \
        pcre_get.obj \
        pcre_globals.obj \
        pcre_info.obj \
-       pcre_internal.obj \
        pcre_maketables.obj \
        pcre_newline.obj \
        pcre_ord2utf8.obj \
@@ -43,9 +42,6 @@ OBJECTS = \
        pcre_valid_utf8.obj \
        pcre_version.obj \
        pcre_xclass.obj \
-       ucp.obj \
-       ucpinternal.obj \
-       ucptable.h.obj \
 
 all : pcre.lib
 

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 7d6c34526b844be614feaf4305b15e9e957138e3..b7e8b4c7ff27aef9be96afec7a558096e660c9f8 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -134,6 +134,11 @@ typedef gint64 goffset;
 #endif
 
 #define G_HAVE_GNUC_VARARGS 1
+#else /* _MSC_VER */
+/* varargs macros available since msvc8 (vs2005) */
+#  if _MSC_VER >= 1400
+#    define G_HAVE_ISO_VARARGS 1
+#   endif
 #endif /* not _MSC_VER */
 #define G_HAVE_GROWING_STACK 0
 

diff --git a/msvc_recommended_pragmas.h b/msvc_recommended_pragmas.h
index ee34eef4d7e526b8c9c680e4bf30dbaae2c790e0..cb9370cc643c85520a4f6211713e6fc5340b171b 100644 (file)
--- a/msvc_recommended_pragmas.h
+++ b/msvc_recommended_pragmas.h
@@ -26,3 +26,6 @@
 
 #pragma warning(disable:4244)  /* No possible loss of data warnings */
 #pragma warning(disable:4305)   /* No truncation from int to char warnings */
+
+/* work around Microsoft's premature attempt to deprecate the C-Library */
+#pragma warning(disable:4996)   /* This function or variable may be unsafe. */

diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index c1f426f5a450e5b9a735592216151bba6e113bad..d04ad740bf408863dc3ed93e5f6780d73d6a623d 100644 (file)
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -25,6 +25,7 @@ TESTS = \
        bit-test.exe \
        bookmarkfile-test.exe \
        child-test.exe \
+       checksum-test.exe \
        completion-test.exe \
        convert-test.exe \
        date-test.exe   \