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

SDL: Fix potential build issues when Qt and SDL2 are in use

This commit is contained in:
Jeffrey Pfau 2015-05-09 13:53:19 -07:00
parent 3d1fbcefb0
commit 0511a2cfd5
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -32,6 +32,7 @@ Bugfixes:
- 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: Solar sensor can have shortcuts set

1
src/platform/sdl/CMakeLists.txt
View File

@ -39,6 +39,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/platform/sdl ${PIXMAN-1_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)