From c7a2b1572bba57d78bea78455f9cd1ab95cd36db Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 31 May 2018 04:23:07 -0700 Subject: [PATCH] CMake: Build Vulkan backend on macOS --- Source/Core/Core/CMakeLists.txt | 5 +---- Source/Core/VideoBackends/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 003f2122ec..658754b097 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -293,6 +293,7 @@ PUBLIC videonull videoogl videosoftware + videovulkan PRIVATE ${LZO} @@ -322,10 +323,6 @@ if(LIBUSB_FOUND) ) endif() -if(NOT APPLE) - target_link_libraries(core PUBLIC videovulkan) -endif() - if(WIN32) target_sources(core PRIVATE HW/EXI/BBA-TAP/TAP_Win32.cpp diff --git a/Source/Core/VideoBackends/CMakeLists.txt b/Source/Core/VideoBackends/CMakeLists.txt index 119f92bca8..e670dd7d4a 100644 --- a/Source/Core/VideoBackends/CMakeLists.txt +++ b/Source/Core/VideoBackends/CMakeLists.txt @@ -1,11 +1,9 @@ add_subdirectory(OGL) add_subdirectory(Null) add_subdirectory(Software) +add_subdirectory(Vulkan) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") add_subdirectory(D3D) endif() -if(NOT APPLE) - add_subdirectory(Vulkan) -endif()