diff --git a/CMakeLists.txt b/CMakeLists.txt index bc0176ba82..f97e4d2837 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) diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index b65b1d6fad..0dbcb1d9d9 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -5,11 +5,7 @@ #include #include #include -#if __APPLE__ -#include -#else #include -#endif #include "Common/Config/Config.h" @@ -21,19 +17,10 @@ static Layers s_layers; static std::list 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; -using WriteLock = std::unique_lock; -#else static std::shared_mutex s_layers_rw_lock; using ReadLock = std::shared_lock; using WriteLock = std::unique_lock; -#endif void AddLayerInternal(std::shared_ptr layer) {