Wed, 10 Mar 2010 19:18:50 -0500Merge. default tip
Ryan C. Gordon <icculus@icculus.org> [Wed, 10 Mar 2010 19:18:50 -0500] rev 4432
Merge.

Wed, 10 Mar 2010 15:07:20 +0000Fixed bug #968
Sam Lantinga <slouken@libsdl.org> [Wed, 10 Mar 2010 15:07:20 +0000] rev 4431
Fixed bug #968

Andrey 2010-03-07 07:57:14 PST

mingw32ce-build small fix

Wed, 10 Mar 2010 15:04:13 +0000Fixed bug #943 SDL-1.2
Sam Lantinga <slouken@libsdl.org> [Wed, 10 Mar 2010 15:04:13 +0000] rev 4430
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.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.

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. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.

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.

Hope these are useful. Thanks.

Wed, 10 Mar 2010 15:02:58 +0000Fixed bug #943
Sam Lantinga <slouken@libsdl.org> [Wed, 10 Mar 2010 15:02:58 +0000] rev 4429
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.

Tue, 09 Mar 2010 06:07:48 +0000Fixed bug #961
Sam Lantinga <slouken@libsdl.org> [Tue, 09 Mar 2010 06:07:48 +0000] rev 4428
Fixed bug #961

Kalle Olavi Niemitalo 2010-02-28 09:15:50 PST

It seems the SDLK_LMETA and SDLK_RMETA constants have been removed from SDL
1.3. I grepped for them in the SDL source tree and these were the only hits:

./include/SDL_compat.h:230:#define SDLK_LSUPER SDLK_LMETA
./include/SDL_compat.h:231:#define SDLK_RSUPER SDLK_RMETA
./src/video/bwindow/SDL_BWin.h:194: keymap[0x66] = SDLK_LMETA;
./src/video/bwindow/SDL_BWin.h:195: keymap[0x67] = SDLK_RMETA;

I don't know how compatible SDL 1.3 is supposed to be with applications
designed for SDL 1.2. However, as you can see, SDL itself is still trying to
use the removed constants, and that is clearly a bug.

Because SDL_compat.h defines KMOD_LMETA as KMOD_LGUI, I suppose it should also
define SDLK_LMETA as SDLK_LGUI, and SDLK_RMETA likewise.

Fri, 05 Mar 2010 15:43:46 +0000Removed reference to compatibility function
Sam Lantinga <slouken@libsdl.org> [Fri, 05 Mar 2010 15:43:46 +0000] rev 4427
Removed reference to compatibility function

Sun, 28 Feb 2010 09:23:23 +0000Disable error checks for reset actuators and set autocenter.
Edgar Simo <bobbens@gmail.com> [Sun, 28 Feb 2010 09:23:23 +0000] rev 4426
Disable error checks for reset actuators and set autocenter.

Reset actuators and set autocenter might not actually be supported on all
implementations. We'll just disable error checking since they aren't
critical to neither opening the joystick nor the haptic subsystem.

Fri, 05 Mar 2010 15:43:46 +0000Removed reference to compatibility function
Sam Lantinga <slouken@libsdl.org> [Fri, 05 Mar 2010 15:43:46 +0000] rev 4425
Removed reference to compatibility function

Sun, 28 Feb 2010 09:23:23 +0000Disable error checks for reset actuators and set autocenter.
Edgar Simo <bobbens@gmail.com> [Sun, 28 Feb 2010 09:23:23 +0000] rev 4424
Disable error checks for reset actuators and set autocenter.

Reset actuators and set autocenter might not actually be supported on all
implementations. We'll just disable error checking since they aren't
critical to neither opening the joystick nor the haptic subsystem.

Sun, 28 Feb 2010 23:45:02 -0800Replaced README.SVN with Mercurial information, for 1.2 branch. SDL-1.2
Ryan C. Gordon <icculus@icculus.org> [Sun, 28 Feb 2010 23:45:02 -0800] rev 4423
Replaced README.SVN with Mercurial information, for 1.2 branch.