diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-17 05:40:26 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-17 05:40:26 +0400 |
| commit | eb21bdd249427465a093a078cda7864309a8f735 (patch) | |
| tree | 1da7dc7f6fd3670bf28b2bf00dfe7ec356344105 /source/gameengine/GamePlayer | |
| parent | 5ba2f4367d6cebc415c4e20572a8cea4e52fb0c3 (diff) | |
| parent | 20d6cd008b8a7b110fff3ca211651693916d9946 (diff) | |
Merging changes from trunk r58091-58323.
Diffstat (limited to 'source/gameengine/GamePlayer')
| -rw-r--r-- | source/gameengine/GamePlayer/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 72f3e60b4a2..4f2531cec2a 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -48,18 +48,18 @@ set(INC ../../../../intern/container ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/moto/include ../../../../intern/string ) set(INC_SYS + ../../../../intern/moto/include ${GLEW_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) -set(SRC +set(SRC GPC_Canvas.cpp GPC_KeyboardDevice.cpp GPC_MouseDevice.cpp diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 0e9422c07aa..4ac9e78232e 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -49,16 +49,16 @@ set(INC ../../../../intern/container ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/moto/include ../../../../intern/string ) set(INC_SYS + ../../../../intern/moto/include ${GLEW_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} ) -set(SRC +set(SRC GPG_Application.cpp GPG_Canvas.cpp GPG_KeyboardDevice.cpp |