From ce97b7bcacac9e23670862a16263caeed0aae2c4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 10 Mar 2010 15:02:58 +0000
Subject: [PATCH] Fixed bug #943

 Ozkan Sezer      2010-02-06 12:31:06 PST

Hi:

Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ .  Despite the name, it
supports both win32 and win64.)

src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.)  I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.

src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.

video/SDL_blit.h (and configure.in) (SDL-1.3-only) :  MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC).  Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)

SDL_win32video.h (SDL-1.3-only) :  Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.

Hope these are useful. Thanks.
---
 configure.in                     | 27 +++++++++++++++++++++++++++
 src/audio/windx5/directx.h       |  7 ++++---
 src/thread/win32/SDL_systhread.c |  2 +-
 src/video/SDL_blit.h             |  8 ++++++++
 src/video/win32/SDL_win32video.h |  1 +
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index ab8c29077..1f6846256 100644
--- a/configure.in
+++ b/configure.in
@@ -418,7 +418,16 @@ AC_HELP_STRING([--enable-mmx], [use MMX assembly routines [[default=yes]]]),
         CFLAGS="$save_CFLAGS $mmx_CFLAGS"
 
         AC_TRY_COMPILE([
+        #ifdef __MINGW32__
+        #include <_mingw.h>
+        #ifdef __MINGW64_VERSION_MAJOR
+        #include <intrin.h>
+        #else
         #include <mmintrin.h>
+        #endif
+        #else
+        #include <mmintrin.h>
+        #endif
         #ifndef __MMX__
         #error Assembler CPP flag not enabled
         #endif
@@ -472,7 +481,16 @@ AC_HELP_STRING([--enable-sse], [use SSE assembly routines [[default=yes]]]),
         CFLAGS="$save_CFLAGS $sse_CFLAGS"
 
         AC_TRY_COMPILE([
+        #ifdef __MINGW32__
+        #include <_mingw.h>
+        #ifdef __MINGW64_VERSION_MAJOR
+        #include <intrin.h>
+        #else
+        #include <xmmintrin.h>
+        #endif
+        #else
         #include <xmmintrin.h>
+        #endif
         #ifndef __SSE__
         #error Assembler CPP flag not enabled
         #endif
@@ -499,7 +517,16 @@ AC_HELP_STRING([--enable-sse2], [use SSE2 assembly routines [[default=no]]]),
         CFLAGS="$save_CFLAGS $sse2_CFLAGS"
 
         AC_TRY_COMPILE([
+        #ifdef __MINGW32__
+        #include <_mingw.h>
+        #ifdef __MINGW64_VERSION_MAJOR
+        #include <intrin.h>
+        #else
+        #include <emmintrin.h>
+        #endif
+        #else
         #include <emmintrin.h>
+        #endif
         #ifndef __SSE2__
         #error Assembler CPP flag not enabled
         #endif
diff --git a/src/audio/windx5/directx.h b/src/audio/windx5/directx.h
index bb9f2d2e1..6af9560d4 100644
--- a/src/audio/windx5/directx.h
+++ b/src/audio/windx5/directx.h
@@ -2,6 +2,10 @@
 #ifndef _directx_h
 #define _directx_h
 
+#ifdef __GNUC__
+#define NONAMELESSUNION
+#endif
+
 /* Include all of the DirectX 5.0 headers and adds any necessary tweaks */
 
 #define WIN32_LEAN_AND_MEAN
@@ -74,9 +78,6 @@
 #define DIRECTSOUND_VERSION 0x0500
 #define DIRECTINPUT_VERSION 0x0500
 
-#ifdef __GNUC__
-#define NONAMELESSUNION
-#endif
 #include <ddraw.h>
 #include <dsound.h>
 #include <dinput.h>
diff --git a/src/thread/win32/SDL_systhread.c b/src/thread/win32/SDL_systhread.c
index 71c0e1269..71313c3be 100644
--- a/src/thread/win32/SDL_systhread.c
+++ b/src/thread/win32/SDL_systhread.c
@@ -37,7 +37,7 @@
 #endif
 
 #if __GNUC__
-typedef unsigned long (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+typedef uintptr_t (__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
                                                              unsigned
                                                              (__stdcall *
                                                               func) (void *),
diff --git a/src/video/SDL_blit.h b/src/video/SDL_blit.h
index 756c50a24..21f1ba62a 100644
--- a/src/video/SDL_blit.h
+++ b/src/video/SDL_blit.h
@@ -24,6 +24,13 @@
 #ifndef _SDL_blit_h
 #define _SDL_blit_h
 
+#ifdef __MINGW32__
+#include <_mingw.h>
+#endif
+
+#if defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR)
+#include <intrin.h>
+#else
 #ifdef __MMX__
 #include <mmintrin.h>
 #endif
@@ -36,6 +43,7 @@
 #ifdef __SSE2__
 #include <emmintrin.h>
 #endif
+#endif
 
 #include "SDL_cpuinfo.h"
 #include "SDL_endian.h"
diff --git a/src/video/win32/SDL_win32video.h b/src/video/win32/SDL_win32video.h
index b33d51889..fb1e96f96 100644
--- a/src/video/win32/SDL_win32video.h
+++ b/src/video/win32/SDL_win32video.h
@@ -29,6 +29,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define STRICT
 #define UNICODE
+#undef WINVER
 #define WINVER  0x500           /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
 #include <windows.h>