piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10037 from OatmealDome/min-macos-bump

Browse Source 
Bump minimum macOS to 10.13 High Sierra
This commit is contained in:
Mai M 2021-08-17 22:59:43 -04:00 committed by GitHub
commit 437b475254
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildMacOSUniversalBinary.py
View File

@ -64,7 +64,7 @@ DEFAULT_CONFIG = {
# Minimum macOS version for each architecture slice # Minimum macOS version for each architecture slice
"arm64_mac_os_deployment_target": "11.0.0", "arm64_mac_os_deployment_target": "11.0.0",
"x86_64_mac_os_deployment_target": "10.12.0", "x86_64_mac_os_deployment_target": "10.13.0",
# CMake Generator to use for building # CMake Generator to use for building
"generator": "Unix Makefiles", "generator": "Unix Makefiles",

4
CMakeLists.txt
View File

@ -8,9 +8,9 @@ cmake_minimum_required(VERSION 3.10)
# MacOS prior to 10.14 did not support aligned alloc which is used to implement # MacOS prior to 10.14 did not support aligned alloc which is used to implement
# std::unique_ptr in the arm64 C++ standard library. x86_64 builds can override # std::unique_ptr in the arm64 C++ standard library. x86_64 builds can override
# this to 10.12.0 using -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12.0" without issue. # this to 10.13.0 using -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13.0" without issue.
# This is done in the universal binary building script to build a binary that # This is done in the universal binary building script to build a binary that
# runs on 10.12 on x86_64 computers, while still containing an arm64 slice. # runs on 10.13 on x86_64 computers, while still containing an arm64 slice.
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "")

2
Readme.md
View File

@ -15,7 +15,7 @@ Please read the [FAQ](https://dolphin-emu.org/docs/faq/) before using Dolphin.
* OS * OS
* Windows (7 SP1 or higher). * Windows (7 SP1 or higher).
* Linux. * Linux.
* macOS (10.12 Sierra or higher). * macOS (10.13 High Sierra or higher).
* Unix-like systems other than Linux are not officially supported but might work. * Unix-like systems other than Linux are not officially supported but might work.
* Processor * Processor
* A CPU with SSE2 support. * A CPU with SSE2 support.

38
Source/Core/Common/FileUtil.cpp
View File

@ -795,29 +795,27 @@ std::string GetBundleDirectory()
// this function, so bundle_ref will be untranslocated if necessary. // this function, so bundle_ref will be untranslocated if necessary.
// //
// More information: https://objective-see.com/blog/blog_0x15.html // More information: https://objective-see.com/blog/blog_0x15.html
if (__builtin_available(macOS 10.12, *))
// The APIs to deal with translocated paths are private, so we have
// to dynamically load them from the Security framework.
//
// The headers can be found under "Security" on opensource.apple.com:
// Security/OSX/libsecurity_translocate/lib/SecTranslocate.h
if (!s_security_framework.IsOpen())
{ {
// The APIs to deal with translocated paths are private, so we have s_security_framework.Open("/System/Library/Frameworks/Security.framework/Security");
// to dynamically load them from the Security framework. s_security_framework.GetSymbol("SecTranslocateIsTranslocatedURL", &s_is_translocated_url);
// s_security_framework.GetSymbol("SecTranslocateCreateOriginalPathForURL", &s_create_orig_path);
// The headers can be found under "Security" on opensource.apple.com: }
// Security/OSX/libsecurity_translocate/lib/SecTranslocate.h
if (!s_security_framework.IsOpen())
{
s_security_framework.Open("/System/Library/Frameworks/Security.framework/Security");
s_security_framework.GetSymbol("SecTranslocateIsTranslocatedURL", &s_is_translocated_url);
s_security_framework.GetSymbol("SecTranslocateCreateOriginalPathForURL", &s_create_orig_path);
}
bool is_translocated = false; bool is_translocated = false;
s_is_translocated_url(bundle_ref, &is_translocated, nullptr); s_is_translocated_url(bundle_ref, &is_translocated, nullptr);
if (is_translocated) if (is_translocated)
{ {
CFURLRef untranslocated_ref = s_create_orig_path(bundle_ref, nullptr); CFURLRef untranslocated_ref = s_create_orig_path(bundle_ref, nullptr);
CFRelease(bundle_ref); CFRelease(bundle_ref);
bundle_ref = untranslocated_ref; bundle_ref = untranslocated_ref;
}
} }
char app_bundle_path[MAXPATHLEN]; char app_bundle_path[MAXPATHLEN];