Reinitialize SDL's joystick subsystem when scanning for sticks, so

[supertux.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e83c442..ca212d4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,11 +164,15 @@ FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/audio/*
 
 OPTION(DEBUG "Build with debugging options" OFF)
 OPTION(PROFILE "Build with profiling information" OFF)
-OPTION(WERROR "Build stops on first compiler warning" 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)
+    IF(WERROR)
+      ADD_DEFINITIONS(-Werror)
+    ENDIF(WERROR)
   ELSE (DEBUG)
     ADD_DEFINITIONS(-O2)
     REMOVE_DEFINITIONS(-O0 -g)
@@ -178,11 +182,6 @@ IF(CMAKE_COMPILER_IS_GNUCC)
   ELSE (PROFILE)
     REMOVE_DEFINITIONS(-pg)
   ENDIF (PROFILE)
-  IF (WERROR)
-    ADD_DEFINITIONS(-Wall -Werror)
-  ELSE (WERROR)
-    REMOVE_DEFINITIONS(-Wall -Werror)
-  ENDIF (WERROR)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 ## Add in squirrel debug stuff