Merge remote-tracking branch 'origin/master' into Sound

2015-09-15 16:09:42 +02:00
parent 5695a8c068 4cb1a780c5
commit aec694359c
18 changed files with 491 additions and 102 deletions
@@ -78,8 +78,7 @@ set(SOURCE_FILES
    ${SOURCE_FILES_Rendering}
    ${SOURCE_FILES_Transform}
    ${SOURCE_FILES_Physics}
-    ${SOURCE_FILES_Game}
-)
+    ${SOURCE_FILES_Game} ../../include/Game/CLife.h ../../include/Game/ELifeLost.h)

 if(CMAKE_COMPILER_IS_GNUCXX)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")