sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Allowing the BGE to build with SDL2. I'm not sure if this is the correct fix yet, but at least it builds.

Browse Source
This commit is contained in:
Mitchell Stokes 2013-08-29 22:48:27 +00:00
parent 16a36f320f
commit f62fabca3d
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
View File

@ -278,7 +278,11 @@ void SCA_Joystick::DestroyJoystickDevice(void)
{
#ifdef WITH_SDL
if (m_isinit) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (SDL_JoystickGetAttached(m_private->m_joystick)) {
#else
if (SDL_JoystickOpened(m_joyindex)) {
#endif
JOYSTICK_ECHO("Closing-joystick " << m_joyindex);
SDL_JoystickClose(m_private->m_joystick);
}
@ -290,7 +294,12 @@ void SCA_Joystick::DestroyJoystickDevice(void)
int SCA_Joystick::Connected(void)
{
#ifdef WITH_SDL
if (m_isinit && SDL_JoystickOpened(m_joyindex))
if (m_isinit
#if SDL_VERSION_ATLEAST(2, 0, 0)
&& SDL_JoystickGetAttached(m_private->m_joystick))
#else
&& SDL_JoystickOpened(m_joyindex))
#endif
return 1;
#endif
return 0;
@ -328,7 +337,11 @@ int SCA_Joystick::pAxisTest(int axisnum)
const char *SCA_Joystick::GetName()
{
#ifdef WITH_SDL
#if SDL_VERSION_ATLEAST(2, 0, 0)
return SDL_JoystickName(m_private->m_joystick);
#else
return SDL_JoystickName(m_joyindex);
#endif
#else /* WITH_SDL */
return "";
#endif /* WITH_SDL */