diff options
| author | Jan Cholasta | 2016-12-29 15:45:44 +0100 |
|---|---|---|
| committer | Jan Cholasta | 2016-12-29 15:48:11 +0100 |
| commit | 986db08617b426c8f16bc3e8f06de11e3d450f65 (patch) | |
| tree | 28270178d57c2fb057448316c85652ea293c6dbc | |
| parent | e8052963d779477800d2e007888eecaba3526c82 (diff) | |
| download | aur-986db08617b426c8f16bc3e8f06de11e3d450f65.tar.gz | |
zdoom-2.8.1-3
* Fix patch mangled by git end-of-line normalization
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | 0001-Improve-Mac-GCC-errors-fix-to-work-only-for-GCC.patch | 32 |
2 files changed, 17 insertions, 16 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000000..ec1ffa81eddd --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.patch -text 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 index d28d9abf2993..327d27fe4519 100644 --- 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 @@ -15,27 +15,27 @@ 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 ) +
+ 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 74b83e5fc..b2402b96b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -458,7 +458,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") + 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 |