From 772f2dea90f4a0234f0f7549eb8bf840f44f06f6 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 29 Jul 2023 16:08:40 +0200 Subject: [PATCH] (macOS) Changed the minimum required OS version from 10.14 'Mojave' to 10.15 'Catalina' Also completely removed support for the legacy OS build --- CMakeLists.txt | 10 +--------- es-app/CMakeLists.txt | 13 +++---------- es-app/assets/EmulationStation-DE_Info.plist | 2 +- es-core/src/ThemeData.h | 16 ---------------- tools/macOS_dependencies_build.sh | 2 +- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0596c643c..8648f2fb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 3.13) if(APPLE) # Set this to the minimum supported macOS version, and also update # es-app/assets/EmulationStation-DE_Info.plist accordingly. - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14 CACHE STRING "macOS deployment target") + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "macOS deployment target") # This optional variable is used for code signing the DMG installer. set(MACOS_CODESIGN_IDENTITY "" CACHE STRING "macOS code signing certificate identity") endif() @@ -272,10 +272,6 @@ if(APPLE) if(MACOS_CODESIGN_IDENTITY) message("-- Code signing certificate identity: " ${MACOS_CODESIGN_IDENTITY}) endif() - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) - set(BUNDLED_CERTS ON) - message("-- macOS version 10.13 or lower has been set, so if code signing is enabled, Hardened Runtime will not be used") - endif() endif() if(WIN32) @@ -377,10 +373,6 @@ if(APPLE) endif() endif() -if(APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) - add_compile_definitions(LEGACY_MACOS) -endif() - # Affects the application updater and is used for displaying version info in the main menu. if(ES_VERSION MATCHES alpha OR ES_VERSION MATCHES beta OR ES_VERSION MATCHES dev) add_compile_definitions(IS_PRERELEASE) diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index db48566ef..6878a2fa3 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -378,13 +378,8 @@ endif() # Settings per operating system and generator type. if(APPLE) set(CPACK_GENERATOR Bundle) - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14) - set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}_legacy) - set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}_legacy") - else() - set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) - set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") - endif() + set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}) + set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns) set(CPACK_DMG_DS_STORE ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_DS_Store) set(CPACK_BUNDLE_NAME "EmulationStation Desktop Edition") @@ -392,9 +387,7 @@ if(APPLE) set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist) if(MACOS_CODESIGN_IDENTITY) set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ${MACOS_CODESIGN_IDENTITY}") - if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.13) - set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime") - endif() + set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime") endif() elseif(WIN32) set(CPACK_GENERATOR NSIS) diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist index d65ac77b0..c10aa1b6f 100644 --- a/es-app/assets/EmulationStation-DE_Info.plist +++ b/es-app/assets/EmulationStation-DE_Info.plist @@ -29,7 +29,7 @@ LSApplicationCategoryType public.app-category.games LSMinimumSystemVersion - 10.14.0 + 10.15.0 LSUIPresentationMode 3 NSHighResolutionCapable diff --git a/es-core/src/ThemeData.h b/es-core/src/ThemeData.h index af429712c..fe5be94d9 100644 --- a/es-core/src/ThemeData.h +++ b/es-core/src/ThemeData.h @@ -135,21 +135,6 @@ public: template const T get(const std::string& prop) const { -#if defined(LEGACY_MACOS) - if (std::is_same::value) - return *(const T*)&properties.at(prop).v; - else if (std::is_same::value) - return *(const T*)&properties.at(prop).s; - else if (std::is_same::value) - return *(const T*)&properties.at(prop).i; - else if (std::is_same::value) - return *(const T*)&properties.at(prop).f; - else if (std::is_same::value) - return *(const T*)&properties.at(prop).b; - else if (std::is_same::value) - return *(const T*)&properties.at(prop).r; - return T(); -#else if (std::is_same::value) return std::any_cast(properties.at(prop).v); else if (std::is_same::value) @@ -163,7 +148,6 @@ public: else if (std::is_same::value) return std::any_cast(properties.at(prop).r); return T(); -#endif } bool has(const std::string& prop) const diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index d6811d259..59056b280 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -12,7 +12,7 @@ # This script needs to run from the root of the repository. # -export MACOSX_DEPLOYMENT_TARGET=10.14 +export MACOSX_DEPLOYMENT_TARGET=10.15 # How many CPU threads to use for the compilation. JOBS=4