Some animation/hitbox fixes

[supertux.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ed9a26..8c3a6ca 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,19 +158,24 @@ include_directories (${SUPERTUX_SOURCE_DIR}/src/squirrel/include/)
 
 ## Build list of sources for supertux binary
 
-FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/audio/*.cpp src/badguy/*.cpp src/binreloc/*.cpp src/control/*.cpp src/gui/*.cpp src/lisp/*.cpp src/math/*.cpp src/object/*.cpp src/physfs/*.cpp src/sprite/*.cpp src/tinygettext/*.cpp src/trigger/*.cpp src/video/*.cpp src/worldmap/*.cpp src/scripting/*.cpp src/obstack/*.c)
+FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/audio/*.cpp src/badguy/*.cpp src/binreloc/*.cpp src/control/*.cpp src/gui/*.cpp src/lisp/*.cpp src/math/*.cpp src/object/*.cpp src/physfs/*.cpp src/sprite/*.cpp src/tinygettext/*.cpp src/trigger/*.cpp src/video/*.cpp src/worldmap/*.cpp src/scripting/*.cpp src/addon/*.cpp src/obstack/*.c)
 
 ## Debug options
 
 OPTION(DEBUG "Build with debugging options" OFF)
 OPTION(PROFILE "Build with profiling information" OFF)
+OPTION(WERROR "Stops on first compiler warning in debug mode" ON)
 IF(CMAKE_COMPILER_IS_GNUCC)
+  ADD_DEFINITIONS(-Wall -W)
   IF (DEBUG)
     REMOVE_DEFINITIONS(-O2)
-    ADD_DEFINITIONS(-O0 -g -Wall -Werror)
+    ADD_DEFINITIONS(-O0 -g)
+    IF(WERROR)
+      ADD_DEFINITIONS(-Werror)
+    ENDIF(WERROR)
   ELSE (DEBUG)
     ADD_DEFINITIONS(-O2)
-    REMOVE_DEFINITIONS(-O0 -g -Wall -Werror)
+    REMOVE_DEFINITIONS(-O0 -g)
   ENDIF (DEBUG)
   IF (PROFILE)
     ADD_DEFINITIONS(-pg)
@@ -347,7 +352,7 @@ INSTALL(TARGETS supertux2 DESTINATION ${INSTALL_SUBDIR_BIN})
 
 INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/INSTALL ${SUPERTUX_SOURCE_DIR}/README ${SUPERTUX_SOURCE_DIR}/COPYING ${SUPERTUX_SOURCE_DIR}/WHATSNEW.txt DESTINATION ${INSTALL_SUBDIR_DOC})
 
-INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/data/credits.txt ${SUPERTUX_SOURCE_DIR}/data/camera.cfg DESTINATION ${INSTALL_SUBDIR_SHARE})
+INSTALL(FILES ${SUPERTUX_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
 INSTALL(DIRECTORY data/images DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY data/levels DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY data/music DESTINATION ${INSTALL_SUBDIR_SHARE} PATTERN ".svn" EXCLUDE)