diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
| commit | af3057df7eb41973349b407539846f17d9094c21 (patch) | |
| tree | 0940a188a0cfc43a99505f55513516866a57d145 /src/CMakeLists.txt | |
| parent | f95df35dc58e01b99ffddfc4ad394feaa4460b09 (diff) | |
| download | colobot-af3057df7eb41973349b407539846f17d9094c21.tar.gz colobot-af3057df7eb41973349b407539846f17d9094c21.tar.bz2 colobot-af3057df7eb41973349b407539846f17d9094c21.zip | |
Merged changes from dev
Resolved conflicts & added fixes.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a02e7b9..c72bcd9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,6 +31,7 @@ app/main.cpp app/system.cpp common/event.cpp common/image.cpp +common/logger.cpp common/iman.cpp # common/metafile.cpp # common/misc.cpp @@ -118,7 +119,7 @@ graphics/opengl/glengine.cpp # script/cbottoken.cpp # script/cmdtoken.cpp # script/script.cpp -sound/sound.cpp +# sound/sound.cpp # ui/button.cpp # ui/check.cpp # ui/color.cpp |