Merge. default tip
authorRyan C. Gordon <icculus@icculus.org>
Wed, 10 Mar 2010 19:18:50 -0500
changeset 4432 a5ba22ac4060
parent 4425 3e5c761bcf7e (current diff)
parent 4431 68dfd6df47da (diff)
Merge.
--- a/configure.in	Fri Mar 05 15:43:46 2010 +0000
+++ b/configure.in	Wed Mar 10 19:18:50 2010 -0500
@@ -418,7 +418,16 @@
         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 @@
         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 @@
         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
@@ -2355,6 +2382,12 @@
             fi
             have_audio=yes
         fi
+        # Set up files for the atomic operations library
+        if test x$enable_atomic = xyes; then
+            AC_DEFINE(SDL_ATOMIC_WIN32)
+            SOURCES="$SOURCES $srcdir/src/atomic/win32/*.c"
+            have_atomic=yes
+        fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
             AC_DEFINE(SDL_THREAD_WIN32)
@@ -2376,12 +2409,6 @@
             SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
             have_loadso=yes
         fi
-        # Set up files for the system power library
-        if test x$enable_power = xyes; then
-            AC_DEFINE(SDL_POWER_WINDOWS)
-            SOURCES="$SOURCES $srcdir/src/power/windows/*.c"
-            have_power=yes
-        fi
         # Set up the system libraries we need
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl -lmmtimer"
         # The Win32 platform requires special setup
--- a/include/SDL_compat.h	Fri Mar 05 15:43:46 2010 +0000
+++ b/include/SDL_compat.h	Wed Mar 10 19:18:50 2010 -0500
@@ -206,6 +206,8 @@
 #define SDLK_NUMLOCK SDLK_NUMLOCKCLEAR
 #define SDLK_SCROLLOCK SDLK_SCROLLLOCK
 #define SDLK_PRINT SDLK_PRINTSCREEN
+#define SDLK_LMETA SDLK_LGUI
+#define SDLK_RMETA SDLK_RGUI
 /*@}*//*Renamed keys*/
 
 /**
--- a/src/audio/windx5/directx.h	Fri Mar 05 15:43:46 2010 +0000
+++ b/src/audio/windx5/directx.h	Wed Mar 10 19:18:50 2010 -0500
@@ -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>
--- a/src/thread/win32/SDL_systhread.c	Fri Mar 05 15:43:46 2010 +0000
+++ b/src/thread/win32/SDL_systhread.c	Wed Mar 10 19:18:50 2010 -0500
@@ -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 *),
--- a/src/video/SDL_blit.h	Fri Mar 05 15:43:46 2010 +0000
+++ b/src/video/SDL_blit.h	Wed Mar 10 19:18:50 2010 -0500
@@ -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"
--- a/src/video/win32/SDL_win32video.h	Fri Mar 05 15:43:46 2010 +0000
+++ b/src/video/win32/SDL_win32video.h	Wed Mar 10 19:18:50 2010 -0500
@@ -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>