Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor MingW patches backported from dev branch.
  • Loading branch information
icculus committed Sep 6, 2005
1 parent 33ce477 commit 7130cea
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions configure.in
Expand Up @@ -383,8 +383,13 @@ fi
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
Expand Down
2 changes: 1 addition & 1 deletion platform/win32.c
Expand Up @@ -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

Expand Down

0 comments on commit 7130cea

Please sign in to comment.