Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #136 from monwarez/patch-freebsd 

Don't init force feedback if not used, fixed #105.

SDL_INIT_HAPTIC (also a part of SDL_INIT_EVERYTHING) is not supported on BSD OS
This commit is contained in:
filux 2016-10-29 01:12:37 +02:00 committed by GitHub
parent 0f1272f338 79e00dfcad
commit d40a6fdc1b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/platform/sdl/platform_main.h
View File

@ -667,7 +667,8 @@ int mainSetup(int argc, char **argv) {
}
else {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | \
SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) < 0) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
return 3;