From 0511a2cfd5d1a0b634a981cb598abff6f02a779c Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 9 May 2015 13:53:19 -0700 Subject: [PATCH] SDL: Fix potential build issues when Qt and SDL2 are in use --- CHANGES | 1 + src/platform/sdl/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index 04ab7be0b..fe6c5773c 100644 --- a/CHANGES +++ b/CHANGES @@ -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 diff --git a/src/platform/sdl/CMakeLists.txt b/src/platform/sdl/CMakeLists.txt index c9a6f8ec5..d07c0ed53 100644 --- a/src/platform/sdl/CMakeLists.txt +++ b/src/platform/sdl/CMakeLists.txt @@ -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)