From 08f6c32551e1aba5e22a3fbe142b0a32fa7e0259 Mon Sep 17 00:00:00 2001 From: tomangelo2 Date: Wed, 9 Feb 2022 20:43:35 +0100 Subject: [PATCH 1/2] Update Homebrew installation command --- INSTALL-MacOSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL-MacOSX.md b/INSTALL-MacOSX.md index 001241fa..85cc5f28 100644 --- a/INSTALL-MacOSX.md +++ b/INSTALL-MacOSX.md @@ -4,7 +4,7 @@ To compile Colobot on MacOS X, you need to first get Developer Command Line Tool After installing Developer Command Line Tools, you should have basic tools like clang and git installed. After that, you can grab other required packages with Homebrew. So as in instructions on [the project page](http://brew.sh/): ```bash - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" ``` And then: ```bash From e3ba1a1840de2953946cafa750df80f636d3505b Mon Sep 17 00:00:00 2001 From: tomangelo2 Date: Thu, 10 Feb 2022 19:46:50 +0100 Subject: [PATCH 2/2] Fix compilation errors on MacOS --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b534a5..19e2fa0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") # Platform-dependent implementation of system.h set(SYSTEM_CPP_MODULE "system_macosx.cpp") set(SYSTEM_H_MODULE "system_macosx.h") + # Fix compilation errors in MacOS SDK files + set(CMAKE_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-nullability-extension -Wno-nullability-completeness -Wno-expansion-to-defined -Wno-four-char-constants -Wno-gnu-zero-variadic-macro-arguments -Wno-variadic-macros -Wno-zero-length-array") # To avoid CMake warning set(CMAKE_MACOSX_RPATH 1) elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")