Mercurial > sdl-ios-xcode
view .hgignore @ 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 | be1929ccaa3d |
children | ba66ff156955 aece2b6fb985 |
line wrap: on
line source
syntax:glob aclocal.m4 autom4te* config.cache config.log config.status configure libtool Makefile sdl-config SDL.spec SDL.qpg build build-deps VisualC VisualCE Xcode .DS_Store sdl.pc include/SDL_config.h include/SDL_revision.h test/aclocal.m4 test/autom4te* test/config.cache test/config.log test/config.status test/configure test/Makefile test/SDL.dll test/stdout.txt test/stderr.txt test/checkkeys test/graywin test/loopwave test/testpower test/testalpha test/testbitmap test/testblitspeed test/testcdrom test/testdyngl test/testerror test/testfile test/testgamma test/testgl test/testhread test/testiconv test/testjoystick test/testkeys test/testlock test/testoverlay test/testoverlay2 test/testpalette test/testplatform test/testsem test/testsprite test/testtimer test/testver test/testvidinfo test/testwin test/testwm test/threadwin test/torturethread test/testloadso test/testgl2 test/testcursor test/testwm2 test/testmultiaudio test/testresample test/testdraw2 test/testmmousetablet test/testdyngles test/testaudioinfo test/testgles test/testsprite2 test/testintersections test/testhaptic test/testime test/testatomic test/testspriteminimal test/testfill test/*.exe test/*.dSYM