From e63aab75a06c11af1ff5dd21a5270e10cf6de136 Mon Sep 17 00:00:00 2001 From: sjanzou Date: Mon, 13 Dec 2021 04:22:06 -0700 Subject: [PATCH 1/4] macOS min version 10.10 for wxWidgets 3.1.5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e53b1bf..d563dbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.11) option(SAM_SKIP_TOOLS "Skips the lk sandbox" OFF) if (APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version") endif () if (UNIX AND NOT CMAKE_C_COMPILER) From 6de4ba55af4a69196bb37795046a5ca9a354c77d Mon Sep 17 00:00:00 2001 From: sjanzou Date: Thu, 16 Dec 2021 05:37:18 -0700 Subject: [PATCH 2/4] wxWidgets 10.15 support --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d563dbc..9d7822c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.11) option(SAM_SKIP_TOOLS "Skips the lk sandbox" OFF) if (APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") endif () if (UNIX AND NOT CMAKE_C_COMPILER) From 3ccf4400a5480c550c0e713ca5acb3c42e3442d3 Mon Sep 17 00:00:00 2001 From: sjanzou Date: Sun, 19 Dec 2021 18:23:40 -0700 Subject: [PATCH 3/4] Update cmake minimum 3.19 for macOS --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d7822c..3e488fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON) -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.19) option(SAM_SKIP_TOOLS "Skips the lk sandbox" OFF) @@ -60,7 +60,8 @@ else (MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_POSITION_INDEPENDENT_CODE ON) if (APPLE) - add_compile_options(-arch x86_64 -fno-common) +# add_compile_options( -arch x86_64 -arch arm64 -fno-common) + add_compile_options( -fno-common) add_definitions(-DWX_PRECOMP) endif () add_compile_options(-Wall -O2 -Werror) From cddb6c16b3454c5a5be65855449c427af89d058c Mon Sep 17 00:00:00 2001 From: sjanzou Date: Fri, 7 Jan 2022 04:16:25 -0700 Subject: [PATCH 4/4] Update per pull request 27 review --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e488fd..0c10a8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ else (MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_POSITION_INDEPENDENT_CODE ON) if (APPLE) -# add_compile_options( -arch x86_64 -arch arm64 -fno-common) add_compile_options( -fno-common) add_definitions(-DWX_PRECOMP) endif ()