Mercurial > sdl-ios-xcode
view .hgtags @ 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 | 7828bb19af1e |
children | 5cb6424a5676 |
line wrap: on
line source
0afe0e38e02cf2048e93582f01c52fbb91d3c7bb release-1.2.7 230b156829ed13b31134d96f689c917981f57b84 release-1.2.5 27cab50ec9c746e886ce0f3fdaa0b0cdc55a594f release-1.2.11 2fe3fbd2bff50165b3cad33bf40d70b3bb3c9fd0 release-1.2.3 3c052d3bcc76c899dfd4846be76243a78e8c7180 release-1.2.4 3c5eed71a3320962551af3b3dfbee0c99fcf0086 release-1.2.10 4867f7f7dd3426d1dbbeef48b3f3b3aa19590cc4 release-1.2.12 6e28dae59e3baf4447c83e833a8d2ac912536f5b release-1.2.1 7c2589fb8d4df54c6faabd3faebd0c0e73f67879 release-1.2.13 86de11faf082881ad9b73a1a1d78733ca07f8db8 release-1.2.6 bb051fa871aa0b53ea57df56a446cec3bb85924c release-1.2.2 cfcb2e1c36ebe9809577adf768b0ec53e8768af9 release-1.2.8 e044e7c70a50a2f54d14ee20d0933e904e5853b6 release-1.2.9 f14cf9d71233934811774f941d0de121d5f96ccf release-1.2.14