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

Conflicts: include/Core/Engine.h
2015-09-17 13:18:56 +02:00
parent 13de4bd1cb bc5a5e5e92
commit 953be0cda9
44 changed files with 18806 additions and 228 deletions
@@ -78,7 +78,7 @@ set(SOURCE_FILES
    ${SOURCE_FILES_Rendering}
    ${SOURCE_FILES_Transform}
    ${SOURCE_FILES_Physics}
-    ${SOURCE_FILES_Game} ../../include/Game/CLife.h ../../include/Game/ELifeLost.h)
+    ${SOURCE_FILES_Game})

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