From 930b10878a648b227c4b806af18dff5b335ac145 Mon Sep 17 00:00:00 2001
From: "matthieu.ranger" <20938940+VHRanger@users.noreply.github.com>
Date: Wed, 1 Jul 2020 23:23:03 -0400
Subject: [PATCH] Addressed review comments

---
 CMakeLists.txt                | 6 ++++--
 src/CMakeLists.txt            | 4 ----
 src/video_core/video_core.cpp | 4 +---
 src/yuzu/bootmanager.cpp      | 4 ----
 src/yuzu_cmd/CMakeLists.txt   | 2 +-
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 308b3ef29e..2d50bd70ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,16 @@ include(DownloadExternals)
 include(CMakeDependentOption)
 
 if (APPLE)
-    set(CMAKE_OSX_ARCHITECTURES "x86_64")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "")
     project(yuzu C CXX ASM)
     option(OSX_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
 else()
     project(yuzu)
 endif()
 
+# Pin build to minimum supported OSX version.
+# 10.15 supports metal 3 so has additional unsupported MVK extensions
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "")
+
 # Set bundled sdl2/qt as dependent options.
 # OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
 option(ENABLE_SDL2 "Enable the SDL2 frontend" ON)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 81427b8e5b..7756476cad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,10 +51,6 @@ if (MSVC)
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG   "/DEBUG /MANIFEST:NO" CACHE STRING "" FORCE)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
 else()
-
-    if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-        add_compile_options("-stdlib=libc++")
-    endif()
     add_compile_options(
         -Wall
         -Werror=implicit-fallthrough
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index f31c9e701f..f60bdc60a5 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -46,9 +46,7 @@ std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Cor
         return std::make_unique<VideoCommon::GPUAsynch>(system, std::move(renderer),
                                                         std::move(context));
     }
-    auto res =
-        std::make_unique<VideoCommon::GPUSynch>(system, std::move(renderer), std::move(context));
-    return res;
+    return std::make_unique<VideoCommon::GPUSynch>(system, std::move(renderer), std::move(context));
 }
 
 u16 GetResolutionScaleFactor(const RendererBase& renderer) {
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index f8b7e47882..e2b5622de1 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -8,10 +8,6 @@
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QMessageBox>
-#ifndef __APPLE__
-#include <QOffscreenSurface>
-#include <QOpenGLContext>
-#endif
 #include <QPainter>
 #include <QScreen>
 #include <QStringList>
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index c78d1b18ff..455380eed3 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -44,6 +44,6 @@ if (MSVC)
     copy_yuzu_unicorn_deps(yuzu-cmd)
 endif()
 
-if (APPLE)
+if (APPLE AND ENABLE_VULKAN)
     target_include_directories(yuzu-cmd PRIVATE ../../externals/MoltenVK/include)
 endif()