diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2020-01-13 20:21:08 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 20:21:08 +1000 |
| commit | ae6d3be449eb7779a3af4fad251c8e0dc3e3df21 (patch) | |
| tree | 66d48207461217ab896db65ec6a2201c6c5998d1 | |
| parent | 1701363854b4a42cc71ecff23eecde7c042a812e (diff) | |
| parent | 002761d9492e7da6dac0ca4c504b764df6fbdd5b (diff) | |
Merge pull request #8530 from s-daveb/master
MacOS: Fixes configuration hang; bump MacOS SDK.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Readme.md | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Config/Config.cpp | 13 |
3 files changed, 5 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 19fa9014ee..2422afa890 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_OSX_ARCHITECTURES "x86_64") # Minimum OS X version. # This is inserted into the Info.plist as well. -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10.0" CACHE STRING "") + +# MacOS prior to 10.12 did not fully support C++17, which is used to +# handle configuration options +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12.0" CACHE STRING "") project(dolphin-emu) @@ -15,7 +15,7 @@ Please read the [FAQ](https://dolphin-emu.org/docs/faq/) before using Dolphin. * OS * Windows (7 SP1 or higher is officially supported, but Vista SP2 might also work). * Linux. - * macOS (10.10 Yosemite or higher). + * macOS (10.12 Sierra or higher). * Unix-like systems other than Linux are not officially supported but might work. * Processor * A CPU with SSE2 support. diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index 4d172ae9c2..2587dc5aac 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -5,11 +5,7 @@ #include <algorithm> #include <list> #include <map> -#if __APPLE__ -#include <mutex> -#else #include <shared_mutex> -#endif #include "Common/Config/Config.h" @@ -21,19 +17,10 @@ static Layers s_layers; static std::list<ConfigChangedCallback> s_callbacks; static u32 s_callback_guards = 0; -// Mac supports shared_mutex since 10.12 and we're targeting 10.10, -// so only use unique locks there... -#if __APPLE__ -static std::mutex s_layers_rw_lock; - -using ReadLock = std::unique_lock<std::mutex>; -using WriteLock = std::unique_lock<std::mutex>; -#else static std::shared_mutex s_layers_rw_lock; using ReadLock = std::shared_lock<std::shared_mutex>; using WriteLock = std::unique_lock<std::shared_mutex>; -#endif static void AddLayerInternal(std::shared_ptr<Layer> layer) { |