ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Don't link against SDLMAIN, Qt already handles that. (#551)

This commit is contained in:
waddlesplash 2017-03-29 23:46:20 -04:00 committed by endrift
parent 874ad93f4d
commit 40f87518be
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/qt/CMakeLists.txt
View File

@ -22,7 +22,7 @@ if(BUILD_SDL)
if(SDL2_FOUND) if(SDL2_FOUND)
link_directories(${SDL2_LIBDIR}) link_directories(${SDL2_LIBDIR})
endif() endif()
list(APPEND PLATFORM_LIBRARY ${SDL_LIBRARY} ${SDLMAIN_LIBRARY}) list(APPEND PLATFORM_LIBRARY ${SDL_LIBRARY})
list(APPEND PLATFORM_SRC ${PLATFORM_SRC} ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-events.c ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-audio.c) list(APPEND PLATFORM_SRC ${PLATFORM_SRC} ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-events.c ${CMAKE_SOURCE_DIR}/src/platform/sdl/sdl-audio.c)
include_directories(${SDL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/platform/sdl) include_directories(${SDL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/src/platform/sdl)
endif() endif()

7
src/platform/qt/main.cpp
View File

@ -3,6 +3,10 @@
* This Source Code Form is subject to the terms of the Mozilla Public * This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
// This must be defined before anything else is included.
#define SDL_MAIN_HANDLED
#include "GBAApp.h" #include "GBAApp.h"
#include "Window.h" #include "Window.h"
@ -22,6 +26,9 @@ Q_IMPORT_PLUGIN(QWindowsAudioPlugin);
#endif #endif
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
#ifdef BUILD_SDL
SDL_SetMainReady();
#endif
QGBA::GBAApp application(argc, argv); QGBA::GBAApp application(argc, argv);
QLocale locale = QLocale::system(); QLocale locale = QLocale::system();