From b26a8010421768e1b8f9bbebc06bf3cdba0b207f Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sun, 20 Aug 2023 22:41:07 +0300 Subject: [PATCH 1/3] More complete PList --- .github/mac-bundle.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index c932c905..ebd88518 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -36,6 +36,15 @@ PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleIconFile string AppIcon PlistBuddy Alber.app/Contents/Info.plist -c "add NSHighResolutionCapable bool true" PlistBuddy Alber.app/Contents/version.plist -c "add ProjectName string Alber" +PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleExecutable string Alber" +PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleDevelopmentRegion string en" +PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleInfoDictionaryVersion string 6.0" +PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleName string Panda3DS" +PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundlePackageType string APPL" +PlistBuddy Alber.app/Contents/Info.plist -c "add NSHumanReadableCopyright string Copyright 2023 Panda3DS Team" + +PlistBuddy Alber.app/Contents/Info.plist -c "set LSMinimumSystemVersion 11.0" + # Bundle dylibs dylibbundler -od -b -x Alber.app/Contents/MacOS/Alber -d Alber.app/Contents/Frameworks/ -p @rpath -s /Users/runner/work/Panda3DS/Panda3DS/VULKAN_SDK/lib From 9e0f590b79f40ed76258e6c91f04a610a65d8ec8 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sun, 20 Aug 2023 22:46:44 +0300 Subject: [PATCH 2/3] Trying to switch to MacOS 10.15 --- .github/mac-bundle.sh | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index ebd88518..ff33a3e7 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -43,7 +43,7 @@ PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleName string Panda3DS" PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundlePackageType string APPL" PlistBuddy Alber.app/Contents/Info.plist -c "add NSHumanReadableCopyright string Copyright 2023 Panda3DS Team" -PlistBuddy Alber.app/Contents/Info.plist -c "set LSMinimumSystemVersion 11.0" +PlistBuddy Alber.app/Contents/Info.plist -c "set LSMinimumSystemVersion 10.15" # Bundle dylibs dylibbundler -od -b -x Alber.app/Contents/MacOS/Alber -d Alber.app/Contents/Frameworks/ -p @rpath -s /Users/runner/work/Panda3DS/Panda3DS/VULKAN_SDK/lib diff --git a/CMakeLists.txt b/CMakeLists.txt index 14262e65..f9716761 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # We need to be able to use enable_language(OBJC) on Mac, so we need CMake 3.16 vs the 3.10 we use otherwise. Blame Apple. if (APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") cmake_minimum_required(VERSION 3.16) else() cmake_minimum_required(VERSION 3.10) From 3009e63cb8a2ea6497ab9863e69688ff59565de2 Mon Sep 17 00:00:00 2001 From: Caleb Yates Date: Mon, 21 Aug 2023 13:45:02 -0500 Subject: [PATCH 3/3] Fix minimum system version --- .github/mac-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/mac-bundle.sh b/.github/mac-bundle.sh index ff33a3e7..314b30f7 100755 --- a/.github/mac-bundle.sh +++ b/.github/mac-bundle.sh @@ -43,7 +43,7 @@ PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundleName string Panda3DS" PlistBuddy Alber.app/Contents/Info.plist -c "add CFBundlePackageType string APPL" PlistBuddy Alber.app/Contents/Info.plist -c "add NSHumanReadableCopyright string Copyright 2023 Panda3DS Team" -PlistBuddy Alber.app/Contents/Info.plist -c "set LSMinimumSystemVersion 10.15" +PlistBuddy Alber.app/Contents/Info.plist -c "add LSMinimumSystemVersion string 10.15" # Bundle dylibs dylibbundler -od -b -x Alber.app/Contents/MacOS/Alber -d Alber.app/Contents/Frameworks/ -p @rpath -s /Users/runner/work/Panda3DS/Panda3DS/VULKAN_SDK/lib