diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2016-10-08 20:58:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 20:58:18 -0700 |
| commit | 3ec91a4e3304f32d15150553c388fabbef45fe97 (patch) | |
| tree | 5cd072545cb380a9f95a9d04ff5dbdb037aa9c5e /Source/Core | |
| parent | d79b42664aa1b198277a3198ab57cb23196ce328 (diff) | |
| parent | f301ebf780efc6216e6548d7985a153cc986bab4 (diff) | |
Merge pull request #4330 from ligfx/no_vulkan_on_mac
Don't build Vulkan video backend on macOS
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoBackendBase.cpp | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 8d62fc0668..21862dafdd 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -236,7 +236,6 @@ set(LIBS sfml-network sfml-system videonull - videovulkan videoogl videosoftware z @@ -249,6 +248,10 @@ if(LIBUSB_FOUND) IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.cpp) endif(LIBUSB_FOUND) +if(NOT APPLE) + set(LIBS ${LIBS} videovulkan) +endif() + set(LIBS ${LIBS} ${MBEDTLS_LIBRARIES}) if(WIN32) diff --git a/Source/Core/VideoBackends/CMakeLists.txt b/Source/Core/VideoBackends/CMakeLists.txt index 64344e43f8..82f2b0c3f3 100644 --- a/Source/Core/VideoBackends/CMakeLists.txt +++ b/Source/Core/VideoBackends/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(OGL) add_subdirectory(Null) add_subdirectory(Software) +if(NOT APPLE) add_subdirectory(Vulkan) +endif() # TODO: Add other backends here! diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 3e07f66eb8..4daac1b194 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -15,7 +15,9 @@ #include "VideoBackends/Null/VideoBackend.h" #include "VideoBackends/OGL/VideoBackend.h" #include "VideoBackends/Software/VideoBackend.h" +#ifndef __APPLE__ #include "VideoBackends/Vulkan/VideoBackend.h" +#endif #include "VideoCommon/VideoBackendBase.h" @@ -49,7 +51,9 @@ void VideoBackendBase::PopulateList() g_available_video_backends.push_back(std::make_unique<DX12::VideoBackend>()); } #endif +#ifndef __APPLE__ g_available_video_backends.push_back(std::make_unique<Vulkan::VideoBackend>()); +#endif g_available_video_backends.push_back(std::make_unique<SW::VideoSoftware>()); g_available_video_backends.push_back(std::make_unique<Null::VideoBackend>()); |