comparison src/video/SDL_blit.h @ 4426:1bceff8f008f

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.
author Sam Lantinga <slouken@libsdl.org>
date Wed, 10 Mar 2010 15:02:58 +0000
parents f7b03b6838cb
children e743b9c3f6d6
comparison
equal deleted inserted replaced
4425:a3e71b957215 4426:1bceff8f008f
22 #include "SDL_config.h" 22 #include "SDL_config.h"
23 23
24 #ifndef _SDL_blit_h 24 #ifndef _SDL_blit_h
25 #define _SDL_blit_h 25 #define _SDL_blit_h
26 26
27 #ifdef __MINGW32__
28 #include <_mingw.h>
29 #endif
30
31 #if defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR)
32 #include <intrin.h>
33 #else
27 #ifdef __MMX__ 34 #ifdef __MMX__
28 #include <mmintrin.h> 35 #include <mmintrin.h>
29 #endif 36 #endif
30 #ifdef __3dNOW__ 37 #ifdef __3dNOW__
31 #include <mm3dnow.h> 38 #include <mm3dnow.h>
33 #ifdef __SSE__ 40 #ifdef __SSE__
34 #include <xmmintrin.h> 41 #include <xmmintrin.h>
35 #endif 42 #endif
36 #ifdef __SSE2__ 43 #ifdef __SSE2__
37 #include <emmintrin.h> 44 #include <emmintrin.h>
45 #endif
38 #endif 46 #endif
39 47
40 #include "SDL_cpuinfo.h" 48 #include "SDL_cpuinfo.h"
41 #include "SDL_endian.h" 49 #include "SDL_endian.h"
42 #include "SDL_video.h" 50 #include "SDL_video.h"