diff options
| author | Jan Cholasta | 2016-12-27 18:38:46 +0100 |
|---|---|---|
| committer | Jan Cholasta | 2016-12-27 19:22:33 +0100 |
| commit | 7f7eef863863e2cf73007cd5867d183f58c1fa42 (patch) | |
| tree | cda1d73a05104a02b6e9549e49e8a8438b0c6a0a /0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch | |
| parent | 32e40db59765f8b261d542b96a33e9432e9f1b36 (diff) | |
| download | aur-7f7eef863863e2cf73007cd5867d183f58c1fa42.tar.gz | |
gzdoom1-1.9.1-3
* Build with the last fmodex version by default
* Fix compilation with clang
Diffstat (limited to '0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch')
| -rw-r--r-- | 0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch b/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch new file mode 100644 index 000000000000..6a8dcbed4b70 --- /dev/null +++ b/0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch @@ -0,0 +1,41 @@ +From d62e7aa3d68235d6667cb4880df03188013f276b Mon Sep 17 00:00:00 2001 +From: Edoardo Prezioso <edo88@email.it> +Date: Sat, 27 Feb 2016 22:15:29 +0100 +Subject: [PATCH] - Improve Mac GCC errors fix to work only for GCC. + +This fixes Clang complaining about unknown command option '-Wno-unused-but-set-variable' when compiling dumb. +Also I got no new warnings on Clang by excluding '-Wno-unused-result'. +--- + dumb/CMakeLists.txt | 2 +- + src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dumb/CMakeLists.txt b/dumb/CMakeLists.txt +index 7b303297c..dd1fd5e58 100644 +--- a/dumb/CMakeLists.txt ++++ b/dumb/CMakeLists.txt +@@ -9,7 +9,7 @@ set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DDEBUGMODE=1" ) + + if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-pointer-sign -Wno-uninitialized" ) +- if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") ++ if( CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.5" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable" ) + endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") + endif( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b6a8021f9..8ceb8a9fa 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -488,7 +488,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) + set( CMAKE_CXX_FLAGS_MINSIZEREL "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_MINSIZEREL}" ) + set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${REL_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" ) + +- if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") + set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" ) + set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" ) + endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.5") +-- +2.11.0 + |