--- CMakeLists.txt.orig	2010-04-03 11:38:48.000000000 -0500
+++ CMakeLists.txt	2010-10-03 12:00:04.881370735 -0500
@@ -122,9 +122,9 @@
 
 
 #set default flags values for all the project
-set(CMAKE_C_FLAGS "-pipe")
-set(CMAKE_C_FLAGS_RELEASE "-w -O2 -fomit-frame-pointer")
-set(CMAKE_C_FLAGS_DEBUG "-Wall -O0 -g -DDEBUG")
+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})
@@ -137,10 +137,10 @@
 
 if(Optz)
 	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
-	set(haskell_compiler_flags_cmn "-O2" "-w")
+	set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
 else(Optz)
-	set(pascal_compiler_flags_cmn "-O-" "-ghl" "-dDEBUGFILE" "-vwnv" ${pascal_compiler_flags_cmn})
-	set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint")
+	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
+	set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
 endif(Optz)
 
 
@@ -192,7 +192,7 @@
 	set(CPACK_NSIS_MODIFY_PATH OFF)
 	set(CPACK_GENERATOR "ZIP;NSIS")
 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