mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-24 23:14:01 +00:00
Code Issues Releases Wiki Activity

make travis happy (confirmed working with SDL1.2 + SDL2)

Browse source
This commit is contained in:
fgenesis 2021-01-23 13:52:10 +01:00
parent db054e7382
commit e4b2ee6e70
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
BBGE/Core.cpp
View file

@ -538,7 +538,7 @@ void Core::init()
// Don't want to use SDL_INIT_EVERYTHING, in case future changes to SDL add any flags. // Don't want to use SDL_INIT_EVERYTHING, in case future changes to SDL add any flags.
// Ie. At some point SDL2 added a sensors subsystem, which may cause SDL_Init() to fail // Ie. At some point SDL2 added a sensors subsystem, which may cause SDL_Init() to fail
// due to win10 group policies that forbid sensor usage. Probably similar things on OSX. // due to win10 group policies that forbid sensor usage. Probably similar things on OSX.
unsigned sdlflags = SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_EVENTS; unsigned sdlflags = SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK;
quitNestedMainFlag = false; quitNestedMainFlag = false;
#ifdef BBGE_BUILD_SDL2 #ifdef BBGE_BUILD_SDL2
@ -550,7 +550,6 @@ void Core::init()
SDL_putenv((char *) "SDL_MOUSE_RELATIVE=0"); SDL_putenv((char *) "SDL_MOUSE_RELATIVE=0");
#endif #endif
// Haptic is inited separately, in Jostick.cpp, when a joystick is actually plugged in
if((SDL_Init(sdlflags))==-1) if((SDL_Init(sdlflags))==-1)
{ {
std::string msg("Failed to init SDL: "); std::string msg("Failed to init SDL: ");