[hedgewars] The adjust options patch for the new release.
Bruno Wolff III
bruno at fedoraproject.org
Mon Nov 29 01:57:21 UTC 2010
commit 7f0f12d79b0a08c82e82898769abf27e59558565
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Nov 28 19:55:46 2010 -0600
The adjust options patch for the new release.
hedgewars-compiler-opts.patch | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/hedgewars-compiler-opts.patch b/hedgewars-compiler-opts.patch
index ae50855..d96014a 100644
--- a/hedgewars-compiler-opts.patch
+++ b/hedgewars-compiler-opts.patch
@@ -1,38 +1,38 @@
---- 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 @@
+--- CMakeLists.txt.orig 2010-11-28 19:43:29.000000000 -0600
++++ CMakeLists.txt 2010-11-28 19:53:54.000000000 -0600
+@@ -142,9 +142,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 "-pipe ${CMAKE_C_FLAGS}")
+-set(CMAKE_C_FLAGS_RELEASE "-w -O2 -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})
-@@ -137,10 +137,10 @@
-
+@@ -154,10 +154,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")
+ # set(pascal_compiler_flags_cmn "-O3" "-OpPENTIUM4" "-CfSSE3" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
+ 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")
+- set(pascal_compiler_flags_cmn "-O-" "-g" "-gh" "-gl" "-dDEBUGFILE" ${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")
+@@ -209,7 +209,7 @@
+ 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 "")
+- set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
++ set(CPACK_STRIP_FILES "")
endif(WIN32 AND NOT UNIX)
set(CPACK_SOURCE_IGNORE_FILES
More information about the scm-commits
mailing list