diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-03-14 06:17:19 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-04-10 19:20:25 +0200 |
| commit | 970d9e57c817028ad4c2695adc8205e303de20b9 (patch) | |
| tree | 23e1ff2b90d5dad68f75366b71fdd74e5ab1218d | |
| parent | Merge pull request #2345 from ReinUsesLisp/multibind (diff) | |
| download | yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.gz yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.bz2 yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.lz yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.xz yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.tar.zst yuzu-970d9e57c817028ad4c2695adc8205e303de20b9.zip | |
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| m--------- | externals/sirit | 0 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 5 |
4 files changed, 12 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 26b4e5272..3a49c4874 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ [submodule "externals/zstd"] path = externals/zstd url = https://github.com/facebook/zstd +[submodule "sirit"] + path = externals/sirit + url = https://github.com/ReinUsesLisp/sirit diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index aa3319eb1..3f8b6cda8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -72,6 +72,11 @@ if (USE_DISCORD_PRESENCE) target_include_directories(discord-rpc INTERFACE ./discord-rpc/include) endif() +# Sirit +if (ENABLE_VULKAN) + add_subdirectory(sirit) +endif() + if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") diff --git a/externals/sirit b/externals/sirit new file mode 160000 +Subproject f7c4b07a7e14edb1dcd93bc9879c823423705c2 diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 242a0d1cd..fe6b6ef7d 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -132,7 +132,7 @@ if (ENABLE_VULKAN) renderer_vulkan/vk_swapchain.cpp renderer_vulkan/vk_swapchain.h) - target_include_directories(video_core PRIVATE ../../externals/Vulkan-Headers/include) + target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) target_compile_definitions(video_core PRIVATE HAS_VULKAN) endif() @@ -140,3 +140,6 @@ create_target_directory_groups(video_core) target_link_libraries(video_core PUBLIC common core) target_link_libraries(video_core PRIVATE glad) +if (ENABLE_VULKAN) + target_link_libraries(video_core PRIVATE sirit) +endif() |