Skip to content

Commit

Permalink
removed -GD to compile with msvc9 (vs2008) with less complains
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Hans Breuer authored and Hans Breuer committed Dec 9, 2007
1 parent 1550b7b commit b877c83
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 12 deletions.
14 changes: 14 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion gio/makefile.msc
Expand Up @@ -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) $<
8 changes: 4 additions & 4 deletions glib/gfileutils.c
Expand Up @@ -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% */
Expand Down
2 changes: 1 addition & 1 deletion 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 = \
Expand Down
8 changes: 2 additions & 6 deletions glib/pcre/makefile.msc
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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

Expand Down
5 changes: 5 additions & 0 deletions glibconfig.h.win32.in
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions msvc_recommended_pragmas.h
Expand Up @@ -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. */
1 change: 1 addition & 0 deletions tests/makefile.msc.in
Expand Up @@ -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 \
Expand Down

0 comments on commit b877c83

Please sign in to comment.