diff -up hedgewars-src-0.9.18/CMakeLists.txt~ hedgewars-src-0.9.18/CMakeLists.txt
--- hedgewars-src-0.9.18/CMakeLists.txt~	2012-10-31 21:48:12.000000000 +0100
+++ hedgewars-src-0.9.18/CMakeLists.txt	2012-11-01 21:09:58.058213117 +0100
@@ -158,9 +158,9 @@ endif (CMAKE_BUILD_TYPE)
 
 
 #set default flags values for all projects
-set(CMAKE_C_FLAGS "-pipe ${CMAKE_C_FLAGS}")
-set(CMAKE_C_FLAGS_RELEASE "-w -Os -fomit-frame-pointer ${CMAKE_C_FLAGS_RELEASE}")
-set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG ${CMAKE_C_FLAGS_DEBUG}")
+set(CMAKE_C_FLAGS ${CFLAGS})
+set(CMAKE_C_FLAGS_RELEASE ${CFLAGS})
+set(CMAKE_C_FLAGS_DEBUG ${CFLAGS})
 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
@@ -182,13 +182,12 @@ set(haskell_flags "-O2" ${ghflags_parsed
 #get BUILD_TYPE and enable/disable optimisation
 if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
     message(STATUS "Building Debug flavour")
-    set(pascal_flags "-O-" "-g" "-gl" "-gv" ${pascal_flags})
-    set(haskell_flags "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind" ${haskell_flags})
+    set(pascal_flags "-O2" "-Xs" "-Si" ${pascal_flags})
+    set(haskell_flags ${CFLAGS} "-dynamic" ${haskell_flags})
 else()
     message(STATUS "Building Release flavour")
-#    set(pascal_flags "-O3" "-OpPENTIUM4" "-CfSSE3" "-Xs" "-Si" ${pascal_flags})
-    set(pascal_flags "-Os" "-Ooregvar" "-Xs" "-Si" ${pascal_flags})
-    set(haskell_flags "-w" "-fno-warn-unused-do-bind" ${haskell_flags})
+    set(pascal_flags "-O2" "-Xs" "-Si" ${pascal_flags})
+    set(haskell_flags ${CFLAGS} "-dynamic" ${haskell_flags})
 endif()
 
 
@@ -274,7 +273,7 @@ if(WIN32 AND NOT UNIX)
     set(CPACK_GENERATOR "ZIP;NSIS")
     set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "hedgewars")
 else(WIN32 AND NOT UNIX)
-    set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
+    set(CPACK_STRIP_FILES "")
 endif(WIN32 AND NOT UNIX)
 
 set(CPACK_SOURCE_IGNORE_FILES