Minor MingW patches backported from dev branch. stable-1.0
authorRyan C. Gordon <icculus@icculus.org>
Tue, 06 Sep 2005 06:31:04 +0000
branchstable-1.0
changeset 750 1a9776396bb6
parent 744 f97286bd34b9
child 760 ca9215fa54f6
Minor MingW patches backported from dev branch.
CHANGELOG
configure.in
platform/win32.c
--- a/CHANGELOG	Sun Jul 24 01:02:11 2005 +0000
+++ b/CHANGELOG	Tue Sep 06 06:31:04 2005 +0000
@@ -4,6 +4,7 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+09062005 - Happy September. Minor MingW fixes (but it's still broken, I think).
 07232005 - Fixed bug in zip archiver (thanks, Jörg Walter!). Updated zlib to
            1.2.3, which properly includes the security fix. Fixed "make dist"
            to handle .svn dirs and other file changes. Removed "debian"
--- a/configure.in	Sun Jul 24 01:02:11 2005 +0000
+++ b/configure.in	Tue Sep 06 06:31:04 2005 +0000
@@ -383,8 +383,13 @@
 AC_MSG_RESULT([$this_is_cygwin])
 
 AC_MSG_CHECKING([if this is mingw])
+if test x$target_os = xmingw32; then
+  this_is_mingw=yes
+fi
 if test x$target_os = xmingw32msvc; then
   this_is_mingw=yes
+fi
+if test x$this_is_mingw = xyes; then
   PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
   enable_cdrom=yes
   enable_pthreads=no
--- a/platform/win32.c	Sun Jul 24 01:02:11 2005 +0000
+++ b/platform/win32.c	Tue Sep 06 06:31:04 2005 +0000
@@ -25,7 +25,7 @@
 
 #if (defined _MSC_VER)
     #define alloca(x) _alloca(x)
-#elif (defined MINGW)  /* scary...hopefully this is okay. */
+#elif (defined __MINGW32__)  /* scary...hopefully this is okay. */
     #define alloca(x) __builtin_alloca(x) 
 #endif