r765 - in branches/stable-1.0: . platform

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2005-09-06 02:31:04 -0400 (Tue, 06 Sep 2005)
New Revision: 765

Modified:
   branches/stable-1.0/CHANGELOG
   branches/stable-1.0/configure.in
   branches/stable-1.0/platform/win32.c
Log:
Minor MingW patches backported from dev branch.

Modified: branches/stable-1.0/CHANGELOG
===================================================================
--- branches/stable-1.0/CHANGELOG	2005-09-06 06:28:35 UTC (rev 764)
+++ branches/stable-1.0/CHANGELOG	2005-09-06 06:31:04 UTC (rev 765)
@@ -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"

Modified: branches/stable-1.0/configure.in
===================================================================
--- branches/stable-1.0/configure.in	2005-09-06 06:28:35 UTC (rev 764)
+++ branches/stable-1.0/configure.in	2005-09-06 06:31:04 UTC (rev 765)
@@ -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

Modified: branches/stable-1.0/platform/win32.c
===================================================================
--- branches/stable-1.0/platform/win32.c	2005-09-06 06:28:35 UTC (rev 764)
+++ branches/stable-1.0/platform/win32.c	2005-09-06 06:31:04 UTC (rev 765)
@@ -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