Jelajahi Sumber

Minor MingW patches backported from dev branch.

Ryan C. Gordon 20 tahun lalu
induk
melakukan
7130cea2bf
3 mengubah file dengan 7 tambahan dan 1 penghapusan
  1. 1 0
      CHANGELOG
  2. 5 0
      configure.in
  3. 1 1
      platform/win32.c

+ 1 - 0
CHANGELOG

@@ -4,6 +4,7 @@
 
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 -- 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
 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"
            1.2.3, which properly includes the security fix. Fixed "make dist"
            to handle .svn dirs and other file changes. Removed "debian"
            to handle .svn dirs and other file changes. Removed "debian"

+ 5 - 0
configure.in

@@ -383,8 +383,13 @@ fi
 AC_MSG_RESULT([$this_is_cygwin])
 AC_MSG_RESULT([$this_is_cygwin])
 
 
 AC_MSG_CHECKING([if this is mingw])
 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
 if test x$target_os = xmingw32msvc; then
   this_is_mingw=yes
   this_is_mingw=yes
+fi
+if test x$this_is_mingw = xyes; then
   PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
   PHYSFSCFLAGS="$PHYSFSCFLAGS -DWIN32"
   enable_cdrom=yes
   enable_cdrom=yes
   enable_pthreads=no
   enable_pthreads=no

+ 1 - 1
platform/win32.c

@@ -25,7 +25,7 @@
 
 
 #if (defined _MSC_VER)
 #if (defined _MSC_VER)
     #define alloca(x) _alloca(x)
     #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) 
     #define alloca(x) __builtin_alloca(x) 
 #endif
 #endif