diff options
Diffstat (limited to 'games/colobot/files/patch-CMakeLists.txt')
| -rw-r--r-- | games/colobot/files/patch-CMakeLists.txt | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/games/colobot/files/patch-CMakeLists.txt b/games/colobot/files/patch-CMakeLists.txt index 2e7b482c273c..f0f2a9ddd173 100644 --- a/games/colobot/files/patch-CMakeLists.txt +++ b/games/colobot/files/patch-CMakeLists.txt @@ -1,6 +1,17 @@ ---- CMakeLists.txt.orig 2021-12-03 18:38:49 UTC +--- CMakeLists.txt.orig 2021-08-21 20:57:34 UTC +++ CMakeLists.txt -@@ -135,15 +135,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") +@@ -115,8 +115,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") + + # Platform-dependent implementation of system.h + # On FreeBSD we can use *_other +- set(SYSTEM_CPP_MODULE "system_other.cpp") +- set(SYSTEM_H_MODULE "system_other.h") ++ set(SYSTEM_CPP_MODULE "system_linux.cpp") ++ set(SYSTEM_H_MODULE "system_linux.h") + # To avoid CMake warning + set(CMAKE_MACOSX_RPATH 1) + else() +@@ -155,15 +155,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") message(STATUS "Detected GCC version 4.7+") @@ -17,10 +28,14 @@ set(TEST_CXX_FLAGS "-pthread") add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE) elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") -@@ -153,10 +146,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +@@ -173,14 +166,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") message(STATUS "Detected Clang version 3.1+") +- if (${PLATFORM_FREEBSD}) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd") +- endif() +- - set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes") - set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958 - set(RELEASE_CXX_FLAGS "-O2") |