SDL: Fix potential build issues when Qt and SDL2 are in use
Jeffrey Pfau jeffrey@endrift.com
Sat, 09 May 2015 13:53:19 -0700
2 files changed,
2 insertions(+),
0 deletions(-)
M
CHANGES
→
CHANGES
@@ -51,6 +51,7 @@ - GBA: Fix bounds-checking on EEPROM access
- ARM7: Make illegal instruction decoding consistent between ARM and Thumb - GBA BIOS: Initialize a variable that may be uninitialized in very rare cases - ARM7: Fix ARM multiply instructions when PC is a destination register + - SDL: Fix potential build issues when Qt and SDL2 are in use Misc: - Qt: Show multiplayer numbers in window title - Qt: Handle saving input settings better
M
src/platform/sdl/CMakeLists.txt
→
src/platform/sdl/CMakeLists.txt
@@ -39,6 +39,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${PIXMAN-1_INCLUDE_DIR} ${SDL_INCLUDE_DIR})
set(SDL_INCLUDE_DIR "${SDL_INCLUDE_DIR}" PARENT_SCOPE) set(SDL_LIBRARY "${SDL_LIBRARY}" PARENT_SCOPE) +set(SDLMAIN_LIBRARY "${SDLMAIN_LIBRARY}" PARENT_SCOPE) set(MAIN_SRC ${CMAKE_SOURCE_DIR}/src/platform/sdl/main.c)