(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

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

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})
-        set(CPACK_PACKAGE_FILE_NAME EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}_legacy)
+    set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}")
-        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_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")
-            set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime")
-        endif()
     endif()
 elseif(WIN32)
     set(CPACK_GENERATOR NSIS)

es-app/assets/EmulationStation-DE_Info.plist

@@ -29,7 +29,7 @@
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.games</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.14.0</string>
+    <string>10.15.0</string>
     <key>LSUIPresentationMode</key>
     <integer>3</integer>
     <key>NSHighResolutionCapable</key>

es-core/src/ThemeData.h

@@ -135,21 +135,6 @@ public:
 
         template <typename T> const T get(const std::string& prop) const
         {
-#if defined(LEGACY_MACOS)
-            if (std::is_same<T, glm::vec2>::value)
-                return *(const T*)&properties.at(prop).v;
-            else if (std::is_same<T, std::string>::value)
-                return *(const T*)&properties.at(prop).s;
-            else if (std::is_same<T, unsigned int>::value)
-                return *(const T*)&properties.at(prop).i;
-            else if (std::is_same<T, float>::value)
-                return *(const T*)&properties.at(prop).f;
-            else if (std::is_same<T, bool>::value)
-                return *(const T*)&properties.at(prop).b;
-            else if (std::is_same<T, glm::vec4>::value)
-                return *(const T*)&properties.at(prop).r;
-            return T();
-#else
             if (std::is_same<T, glm::vec2>::value)
                 return std::any_cast<const T>(properties.at(prop).v);
             else if (std::is_same<T, std::string>::value)
@@ -163,7 +148,6 @@ public:
             else if (std::is_same<T, glm::vec4>::value)
                 return std::any_cast<const T>(properties.at(prop).r);
             return T();
-#endif
         }
 
         bool has(const std::string& prop) const

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