Mercurial > sdl-ios-xcode
comparison configure.in @ 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 | 47d923feedb0 |
children | 68dfd6df47da |
comparison
equal
deleted
inserted
replaced
4425:a3e71b957215 | 4426:1bceff8f008f |
---|---|
416 AC_MSG_CHECKING(for GCC -mmmx option) | 416 AC_MSG_CHECKING(for GCC -mmmx option) |
417 mmx_CFLAGS="-mmmx" | 417 mmx_CFLAGS="-mmmx" |
418 CFLAGS="$save_CFLAGS $mmx_CFLAGS" | 418 CFLAGS="$save_CFLAGS $mmx_CFLAGS" |
419 | 419 |
420 AC_TRY_COMPILE([ | 420 AC_TRY_COMPILE([ |
421 #ifdef __MINGW32__ | |
422 #include <_mingw.h> | |
423 #ifdef __MINGW64_VERSION_MAJOR | |
424 #include <intrin.h> | |
425 #else | |
421 #include <mmintrin.h> | 426 #include <mmintrin.h> |
427 #endif | |
428 #else | |
429 #include <mmintrin.h> | |
430 #endif | |
422 #ifndef __MMX__ | 431 #ifndef __MMX__ |
423 #error Assembler CPP flag not enabled | 432 #error Assembler CPP flag not enabled |
424 #endif | 433 #endif |
425 ],[ | 434 ],[ |
426 ],[ | 435 ],[ |
470 AC_MSG_CHECKING(for GCC -msse option) | 479 AC_MSG_CHECKING(for GCC -msse option) |
471 sse_CFLAGS="-msse" | 480 sse_CFLAGS="-msse" |
472 CFLAGS="$save_CFLAGS $sse_CFLAGS" | 481 CFLAGS="$save_CFLAGS $sse_CFLAGS" |
473 | 482 |
474 AC_TRY_COMPILE([ | 483 AC_TRY_COMPILE([ |
484 #ifdef __MINGW32__ | |
485 #include <_mingw.h> | |
486 #ifdef __MINGW64_VERSION_MAJOR | |
487 #include <intrin.h> | |
488 #else | |
475 #include <xmmintrin.h> | 489 #include <xmmintrin.h> |
490 #endif | |
491 #else | |
492 #include <xmmintrin.h> | |
493 #endif | |
476 #ifndef __SSE__ | 494 #ifndef __SSE__ |
477 #error Assembler CPP flag not enabled | 495 #error Assembler CPP flag not enabled |
478 #endif | 496 #endif |
479 ],[ | 497 ],[ |
480 ],[ | 498 ],[ |
497 AC_MSG_CHECKING(for GCC -msse2 option) | 515 AC_MSG_CHECKING(for GCC -msse2 option) |
498 sse2_CFLAGS="-msse2" | 516 sse2_CFLAGS="-msse2" |
499 CFLAGS="$save_CFLAGS $sse2_CFLAGS" | 517 CFLAGS="$save_CFLAGS $sse2_CFLAGS" |
500 | 518 |
501 AC_TRY_COMPILE([ | 519 AC_TRY_COMPILE([ |
520 #ifdef __MINGW32__ | |
521 #include <_mingw.h> | |
522 #ifdef __MINGW64_VERSION_MAJOR | |
523 #include <intrin.h> | |
524 #else | |
502 #include <emmintrin.h> | 525 #include <emmintrin.h> |
526 #endif | |
527 #else | |
528 #include <emmintrin.h> | |
529 #endif | |
503 #ifndef __SSE2__ | 530 #ifndef __SSE2__ |
504 #error Assembler CPP flag not enabled | 531 #error Assembler CPP flag not enabled |
505 #endif | 532 #endif |
506 ],[ | 533 ],[ |
507 ],[ | 534 ],[ |