[hedgewars] Adjust compiler opts patch for upstream changes
Bruno Wolff III
bruno at fedoraproject.org
Sun Jan 1 21:47:00 UTC 2012
commit 4a14dbf1131aea5af814d14335108906f317d33d
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sun Jan 1 14:13:04 2012 -0600
Adjust compiler opts patch for upstream changes
hedgewars-compiler-opts.patch | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/hedgewars-compiler-opts.patch b/hedgewars-compiler-opts.patch
index 5ceb97b..12b7110 100644
--- a/hedgewars-compiler-opts.patch
+++ b/hedgewars-compiler-opts.patch
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2011-01-19 20:27:35.000000000 -0600
-+++ CMakeLists.txt 2011-01-19 20:36:53.000000000 -0600
-@@ -138,9 +138,9 @@
+--- CMakeLists.txt.orig 2011-11-19 14:48:08.000000000 -0600
++++ CMakeLists.txt 2012-01-01 14:12:05.663480659 -0600
+@@ -147,9 +147,9 @@
#set default flags values for all the project
@@ -13,21 +13,22 @@
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})
-@@ -150,10 +150,10 @@
+@@ -159,11 +159,11 @@
if(Optz)
# 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 "-O2" "-w" "-fno-warn-unused-do-bind")
+ set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
else(Optz)
-- 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 "-O-" "-g" "-gh" "-gl" "-dDEBUGFILE" ${pascal_compiler_flags_cmn})
+- set(pascal_compiler_flags_cmn "-O-" "-g" "-gl" "-dDEBUGFILE" ${pascal_compiler_flags_cmn})
+- set(haskell_compiler_flags_cmn "-Wall" "-debug" "-dcore-lint" "-fno-warn-unused-do-bind")
+ set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
+ set(haskell_compiler_flags_cmn ${CFLAGS} "-dynamic")
endif(Optz)
-@@ -205,7 +205,7 @@
+@@ -220,7 +220,7 @@
set(CPACK_GENERATOR "ZIP;NSIS")
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "hedgewars")
else(WIN32 AND NOT UNIX)
More information about the scm-commits
mailing list