summaryrefslogtreecommitdiff
path: root/games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch
diff options
context:
space:
mode:
Diffstat (limited to 'games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch')
-rw-r--r--games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch
new file mode 100644
index 00000000..f7ab4f8e
--- /dev/null
+++ b/games-util/dfhack/files/dfhack-0.40.06_pre20140808/02-drop-strange-build-options.patch
@@ -0,0 +1,52 @@
+drop strange build options
+
+From: eroen <eroen@occam.eroen.eu>
+
+
+---
+ CMakeLists.txt | 4 ++--
+ depends/lua/CMakeLists.txt | 2 +-
+ library/CMakeLists.txt | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 43a93a9..56ca990 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,8 +105,8 @@ OPTION(BUILD_PLUGINS "Build the plugins." ON)
+ IF(UNIX)
+ add_definitions(-DLINUX_BUILD)
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable")
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -m32 -march=i686 -mtune=generic -std=c++0x")
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -m32 -march=i686 -mtune=generic")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -std=c++0x")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+ ELSEIF(MSVC)
+ # for msvc, tell it to always use 8-byte pointers to member functions to avoid confusion
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm /MP")
+diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
+index b77bce6..e39eb04 100644
+--- a/depends/lua/CMakeLists.txt
++++ b/depends/lua/CMakeLists.txt
+@@ -12,7 +12,7 @@ ENDIF()
+
+ IF(UNIX)
+ add_definitions(-DLINUX_BUILD)
+- SET(CMAKE_C_FLAGS "-m32")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ ENDIF()
+
+ SET (HDR_LIBLUA
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index e0ad360..9317ac3 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -223,7 +223,7 @@ ADD_CUSTOM_TARGET(generate_headers DEPENDS ${dfapi_SOURCE_DIR}/include/df/codege
+ IF(UNIX)
+ # Don't produce debug info for generated stubs
+ SET_SOURCE_FILES_PROPERTIES(DataStatics.cpp DataStaticsCtor.cpp DataStaticsFields.cpp
+- PROPERTIES COMPILE_FLAGS "-g0 -O1")
++ PROPERTIES COMPILE_FLAGS "-g0")
+ ELSE(WIN32)
+ SET_SOURCE_FILES_PROPERTIES(DataStatics.cpp DataStaticsCtor.cpp DataStaticsFields.cpp
+ PROPERTIES COMPILE_FLAGS "/O1 /bigobj")