From bd1bbdc258a92f5b935f9706920d464a6cee4beb Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 25 Apr 2022 13:28:32 -0500 Subject: [PATCH 1/2] correct mac compilation SDL now leverages https://cmake.org/cmake/help/v3.10/command/enable_language.html --- Tools/CMake/basics.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Tools/CMake/basics.cmake b/Tools/CMake/basics.cmake index c0fc10426..6719036db 100644 --- a/Tools/CMake/basics.cmake +++ b/Tools/CMake/basics.cmake @@ -467,6 +467,19 @@ if(WIN32) ENDFOREACH() endif() else() + if(${CMAKE_VERSION} VERSION_LESS "3.16.0") + macro(CHECK_OBJC_SOURCE_COMPILES SOURCE VAR) + set(PREV_REQUIRED_DEFS "${CMAKE_REQUIRED_DEFINITIONS}") + set(CMAKE_REQUIRED_DEFINITIONS "-x objective-c ${PREV_REQUIRED_DEFS}") + CHECK_C_SOURCE_COMPILES(${SOURCE} ${VAR}) + set(CMAKE_REQUIRED_DEFINITIONS "${PREV_REQUIRED_DEFS}") + endmacro() + else() + include(CheckOBJCSourceCompiles) + if (APPLE) + enable_language(OBJC) + endif() + endif() # TODO: improve default settings on other platforms set(TORQUE_CXX_FLAGS_EXECUTABLES "" CACHE STRING "") mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES) From 4ae7d7ce3f59f078499b7dc20b2e09641a05499a Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 26 Apr 2022 02:00:34 -0500 Subject: [PATCH 2/2] from higuy: "PATH_MAX is defined there on macos" --- Engine/source/platformPOSIX/POSIXFileio.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Engine/source/platformPOSIX/POSIXFileio.cpp b/Engine/source/platformPOSIX/POSIXFileio.cpp index c21e427ba..c9bfdd49c 100644 --- a/Engine/source/platformPOSIX/POSIXFileio.cpp +++ b/Engine/source/platformPOSIX/POSIXFileio.cpp @@ -46,6 +46,9 @@ #if defined(__FreeBSD__) #include #endif +#if defined(__APPLE__) +#include +#endif #include /* these are for reading directors, getting stats, etc. */