blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Recent fix for SDL2 broke joysticks for SDL1.2

This commit is contained in:
Campbell Barton 2015-01-05 20:23:30 +11:00
parent e5063b0bd3
commit 1ef33968fd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,11 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex )
char *videodriver = getenv("SDL_VIDEODRIVER");
BLI_setenv("SDL_VIDEODRIVER", "dummy");
#if SDL_VERSION_ATLEAST(2, 0, 0)
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1 );
#else
int success = (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) != -1 );
#endif
BLI_setenv("SDL_VIDEODRIVER", videodriver);
# endif
@ -156,7 +160,11 @@ void SCA_Joystick::ReleaseInstance()
/* The video subsystem is required for joystick input to work. However,
* when GHOST is running under SDL, video is freed elsewhere.
* Do this once only. */
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
#else
SDL_QuitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO);
#endif
#endif /* WITH_SDL */
}
}