summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2012-08-18 11:30:29 +0200
committererihel <erihel@gmail.com>2012-08-18 11:30:29 +0200
commit48ad79a03c12b923dfdb3795a2138445859cf779 (patch)
tree8fdffe1bc7ef2a5e1008a98a3fbb3bd1e58d4b80 /src/CMakeLists.txt
parentc02ac93379287fd83b134c34aa925c85fcda8e26 (diff)
downloadcolobot-48ad79a03c12b923dfdb3795a2138445859cf779.tar.gz
colobot-48ad79a03c12b923dfdb3795a2138445859cf779.tar.bz2
colobot-48ad79a03c12b923dfdb3795a2138445859cf779.zip
* minor changes to control.cpp to compile it without errors
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b998d19..8870f21 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# CBot shared library is built separately
-add_subdirectory(CBot)
+add_subdirectory(CBot)
# Configure options
@@ -61,9 +61,9 @@ common/image.cpp
common/logger.cpp
common/iman.cpp
# common/metafile.cpp
-# common/misc.cpp
+common/misc.cpp
# common/modfile.cpp
-# common/profile.cpp
+common/profile.cpp
# common/restext.cpp
common/stringutils.cpp
graphics/core/color.cpp
@@ -149,7 +149,7 @@ graphics/opengl/gldevice.cpp
# ui/check.cpp
# ui/color.cpp
# ui/compass.cpp
-# ui/control.cpp
+ui/control.cpp
# ui/displayinfo.cpp
# ui/displaytext.cpp
# ui/edit.cpp
@@ -159,7 +159,7 @@ graphics/opengl/gldevice.cpp
# ui/image.cpp
# ui/interface.cpp
# ui/key.cpp
-# ui/label.cpp
+ui/label.cpp
# ui/list.cpp
# ui/maindialog.cpp
# ui/mainmap.cpp
@@ -190,6 +190,7 @@ ${SDL_IMAGE_INCLUDE_DIR}
${SDLTTF_INCLUDE_DIR}
${PNG_INCLUDE_DIRS}
${OPTIONAL_INCLUDE_DIRS}
+..
)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot)