1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
|
From: Markus Koschany <apo@gambaru.de>
Date: Mon, 2 Jun 2014 20:06:30 +0200
Subject: sdl debian
---
rts/builds/dedicated/CMakeLists.txt | 1 +
rts/builds/headless/CMakeLists.txt | 1 +
rts/lib/headlessStubs/CMakeLists.txt | 2 ++
tools/unitsync/CMakeLists.txt | 1 +
4 files changed, 5 insertions(+)
diff --git a/rts/builds/dedicated/CMakeLists.txt b/rts/builds/dedicated/CMakeLists.txt
index 35de881..4fb0d42 100644
--- a/rts/builds/dedicated/CMakeLists.txt
+++ b/rts/builds/dedicated/CMakeLists.txt
@@ -58,6 +58,7 @@ ELSE (MINGW OR APPLE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
ENDIF (MINGW OR APPLE)
+INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
### Assemble the incude dirs
INCLUDE_DIRECTORIES(${ENGINE_SRC_ROOT_DIR}/)
diff --git a/rts/builds/headless/CMakeLists.txt b/rts/builds/headless/CMakeLists.txt
index bc6bd04..5d2e730 100644
--- a/rts/builds/headless/CMakeLists.txt
+++ b/rts/builds/headless/CMakeLists.txt
@@ -30,6 +30,7 @@ ELSE (MINGW OR APPLE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
ENDIF (MINGW OR APPLE)
+INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
# headlessstubs are our stubs that replace libGL, libGLU, libGLEW, libSDL (yes really!)
LIST(APPEND engineHeadlessLibraries headlessStubs)
diff --git a/rts/lib/headlessStubs/CMakeLists.txt b/rts/lib/headlessStubs/CMakeLists.txt
index 63c44bb..547ec68 100644
--- a/rts/lib/headlessStubs/CMakeLists.txt
+++ b/rts/lib/headlessStubs/CMakeLists.txt
@@ -19,6 +19,8 @@ ELSE (WIN32)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/SDL2)
ENDIF (WIN32)
+INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
+
ADD_LIBRARY(headlessStubs STATIC EXCLUDE_FROM_ALL ${headlessStubsSources})
TARGET_LINK_LIBRARIES(headlessStubs ${Boost_THREAD_LIBRARY} ${Boost_CHRONO_LIBRARY_WITH_RT})
SET_TARGET_PROPERTIES(headlessStubs PROPERTIES COMPILE_FLAGS "${PIC_FLAG}")
diff --git a/tools/unitsync/CMakeLists.txt b/tools/unitsync/CMakeLists.txt
index 7c01a7a..a969430 100644
--- a/tools/unitsync/CMakeLists.txt
+++ b/tools/unitsync/CMakeLists.txt
@@ -33,6 +33,7 @@ ELSE (MINGW)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL2)
ENDIF (MINGW)
+INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIR})
ADD_DEFINITIONS(-DUNITSYNC)
ADD_DEFINITIONS(${PIC_FLAG})
|