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") 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