Addressed review comments

This commit is contained in:
matthieu.ranger
2020-07-01 23:23:03 -04:00
parent d8a9618a62
commit 930b10878a
5 changed files with 6 additions and 14 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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) {

View File

@@ -8,10 +8,6 @@
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QMessageBox>
#ifndef __APPLE__
#include <QOffscreenSurface>
#include <QOpenGLContext>
#endif
#include <QPainter>
#include <QScreen>
#include <QStringList>

View File

@@ -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()