diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2012-09-13 09:09:41 -0700 |
| commit | e9fcec9de52471508933c9d90cc6041ce0af9752 (patch) | |
| tree | 81d0674e4b54e95dad5508948491a26d9d5522da /src/CMakeLists.txt | |
| parent | 8b2bca72dd71a1c23db51269a147443c80758f10 (diff) | |
| parent | 01cc0fbc49696a19a56dfdd8359d4bb77e868925 (diff) | |
| download | colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.gz colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.tar.bz2 colobot-e9fcec9de52471508933c9d90cc6041ce0af9752.zip | |
Merge pull request #45 from Erihel/dev-ui
Changes from dev-ui in erihel's fork
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b998d19..efbd681 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 @@ -64,7 +64,8 @@ common/iman.cpp # common/misc.cpp # common/modfile.cpp # common/profile.cpp -# common/restext.cpp +common/restext.cpp +common/restext_strings.c common/stringutils.cpp graphics/core/color.cpp graphics/engine/camera.cpp @@ -149,10 +150,10 @@ 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 +ui/edit.cpp # ui/editvalue.cpp # ui/gauge.cpp # ui/group.cpp @@ -190,6 +191,7 @@ ${SDL_IMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS} +.. ) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot) |