Merge with changes from Zaba999 fork.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc003b9..4025f78 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -124,7 +124,7 @@ graphics/opengl/gldevice.cpp
 # object/motion/motiontoto.cpp
 # object/motion/motionvehicle.cpp
 # object/motion/motionworm.cpp
-# object/object.cpp
+object/object.cpp
 # object/robotmain.cpp
 # object/task/task.cpp
 # object/task/taskadvance.cpp
@@ -147,10 +147,10 @@ graphics/opengl/gldevice.cpp
 # object/task/taskterraform.cpp
 # object/task/taskturn.cpp
 # object/task/taskwait.cpp
-# physics/physics.cpp
-# script/cbottoken.cpp
-# script/cmdtoken.cpp
-# script/script.cpp
+physics/physics.cpp
+script/cbottoken.cpp
+script/cmdtoken.cpp
+script/script.cpp
 # sound/sound.cpp
 # ui/button.cpp
 # ui/check.cpp
@@ -197,6 +197,7 @@ ${SDL_IMAGE_INCLUDE_DIR}
 ${SDLTTF_INCLUDE_DIR}
 ${PNG_INCLUDE_DIRS}
 ${OPTIONAL_INCLUDE_DIRS}
+..
 )
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/CBot)