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