diff options
author | 2016-04-02 15:37:08 +0200 | |
---|---|---|
committer | 2016-04-02 15:37:08 +0200 | |
commit | 731abe8ba09d51d3418411286d8ed6137ed716ba (patch) | |
tree | 2179a92dce31bfef97532d587f926353b73a633d /src/osd/sdl/sdlmain.cpp | |
parent | 0a3f7c37c74986d53784e47027cec74bbf37eaa0 (diff) |
Fixed joystick on Android preventing application to crash, cleanup init for SDL in total (nw)
Diffstat (limited to 'src/osd/sdl/sdlmain.cpp')
-rw-r--r-- | src/osd/sdl/sdlmain.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp index c2e1479ddd2..8f978560642 100644 --- a/src/osd/sdl/sdlmain.cpp +++ b/src/osd/sdl/sdlmain.cpp @@ -198,6 +198,11 @@ int main(int argc, char *argv[]) setvbuf(stdout, (char *) NULL, _IONBF, 0); setvbuf(stderr, (char *) NULL, _IONBF, 0); +#if defined(SDLMAME_ANDROID) + /* Enable standard application logging */ + SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_VERBOSE); +#endif + // FIXME: this should be done differently #ifdef SDLMAME_UNIX @@ -269,7 +274,7 @@ void sdl_osd_interface::osd_exit() if (!SDLMAME_INIT_IN_WORKER_THREAD) { - SDL_QuitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER ); + SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER ); } } @@ -486,12 +491,7 @@ void sdl_osd_interface::init(running_machine &machine) if (!SDLMAME_INIT_IN_WORKER_THREAD) { -#ifdef SDLMAME_EMSCRIPTEN - // timer brings in threads which are not supported in Emscripten - if (SDL_InitSubSystem(SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE)) { -#else - if (SDL_InitSubSystem(SDL_INIT_TIMER| SDL_INIT_VIDEO| SDL_INIT_GAMECONTROLLER|SDL_INIT_NOPARACHUTE)) { -#endif + if (SDL_InitSubSystem(SDL_INIT_VIDEO)) { osd_printf_error("Could not initialize SDL %s\n", SDL_GetError()); exit(-1); } |