From e4b2ee6e70c754c58bbaa03ad45729ef7cd304b8 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Sat, 23 Jan 2021 13:52:10 +0100 Subject: [PATCH] make travis happy (confirmed working with SDL1.2 + SDL2) --- BBGE/Core.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BBGE/Core.cpp b/BBGE/Core.cpp index 3b31446..fe15592 100644 --- a/BBGE/Core.cpp +++ b/BBGE/Core.cpp @@ -538,7 +538,7 @@ void Core::init() // 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 // 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; #ifdef BBGE_BUILD_SDL2 @@ -550,7 +550,6 @@ void Core::init() SDL_putenv((char *) "SDL_MOUSE_RELATIVE=0"); #endif - // Haptic is inited separately, in Jostick.cpp, when a joystick is actually plugged in if((SDL_Init(sdlflags))==-1) { std::string msg("Failed to init SDL: ");