From 596dd7dd400e0c3ba8d3c72740f0bb2328c313ea Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 23 Nov 2024 19:05:51 +0100 Subject: [PATCH 1/4] port: osx: build for MacOS 10.14 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 184f937b1..8ff4a41f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) +if(APPLE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4" CACHE STRING "Minimum OS X deployment version") +endif() + project(pd C CXX) include(TargetArch) From 460cc25ef5512118ae95c6c4e7735d9a3a32da90 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 23 Nov 2024 19:13:41 +0100 Subject: [PATCH 2/4] port: osx: bump OS target to 10.7, as current SDL2 does not support any lower --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ff4a41f6..e7bb2015f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version") endif() project(pd C CXX) From df3e0359b9e6ef4972d1246dff29b701a9f4bb05 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 23 Nov 2024 19:21:25 +0100 Subject: [PATCH 3/4] port: osx: bump OS target to 10.9, since some things in SDL2 won't work with lower --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7bb2015f..be0126dc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") endif() project(pd C CXX) From 563e8f9f646195a551f7492f6608e720c592ecd3 Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 23 Nov 2024 19:36:38 +0100 Subject: [PATCH 4/4] port: osx: set minimum OS version to 11 for arm64 builds --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be0126dc4..440e899e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.16) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") + if(CMAKE_OSX_ARCHITECTURES MATCHES "arm64") + # ARM Macs start at OS 11. + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version") + else() + # SDL2 requires at least this version for everything to work properly. + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") + endif() endif() project(pd C CXX) @@ -181,7 +187,6 @@ add_compile_options( -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-variable - -Wno-format-truncation ) # C specific flags @@ -194,6 +199,9 @@ add_compile_options($<$:-Wno-unused-function>) if (APPLE) # Make it look for libs in the executable folder manually since CMake's rpath system is wack set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rpath @executable_path") +else() + # This warning is not recognized by XCode/Clang for some reason. + add_compile_options(-Wno-format-truncation) endif() # Dependencies