ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Add spirv-cross include path to util

This commit is contained in:
Stenzek 2024-10-01 21:11:47 +10:00
parent ccc3b114d4
commit 08fe20ad76
No known key found for this signature in database
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/util/CMakeLists.txt
View File

@ -133,7 +133,7 @@ if(ENABLE_OPENGL)
) )
endif() endif()
if(ANDROID) if(ANDROID)
target_include_directories(util PRIVATE "${CMAKE_SOURCE_DIR}/android/app/src/cpp") target_include_directories(util PRIVATE "${CMAKE_SOURCE_DIR}/android")
endif() endif()
endif() endif()
@ -170,9 +170,10 @@ if(ENABLE_VULKAN)
endif() endif()
if(ENABLE_VULKAN OR APPLE) if(ENABLE_VULKAN OR APPLE)
# shaderc is loaded dynamically to reduce module loads on startup. # shaderc/spirv-cross is loaded dynamically to reduce module loads on startup.
get_target_property(SHADERC_INCLUDE_DIR Shaderc::shaderc_shared INTERFACE_INCLUDE_DIRECTORIES) get_target_property(SHADERC_INCLUDE_DIR Shaderc::shaderc_shared INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(util PUBLIC ${SHADERC_INCLUDE_DIR}) get_target_property(SPIRV_CROSS_INCLUDE_DIR spirv-cross-c-shared INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(util PUBLIC ${SHADERC_INCLUDE_DIR} ${SPIRV_CROSS_INCLUDE_DIR})
endif() endif()
if(NOT ANDROID) if(NOT ANDROID)

2
src/util/gpu_device.cpp
View File

@ -22,7 +22,7 @@
#include "fmt/format.h" #include "fmt/format.h"
#include "imgui.h" #include "imgui.h"
#include "shaderc/shaderc.h" #include "shaderc/shaderc.h"
#include "spirv_cross/spirv_cross_c.h" #include "spirv_cross_c.h"
#include "xxhash.h" #include "xxhash.h"
LOG_CHANNEL(GPUDevice); LOG_CHANNEL(GPUDevice);

2
src/util/util.props
View File

@ -23,7 +23,7 @@
<!-- Dependency linking and DLL copying --> <!-- Dependency linking and DLL copying -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DepsIncludeDir)SDL2</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DepsIncludeDir)SDL2;$(DepsIncludeDir)spirv_cross</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>%(AdditionalDependencies);cpuinfo.lib;freetype.lib;jpeg.lib;libpng16.lib;libwebp.lib;lunasvg.lib;SDL2.lib;soundtouch.lib;zlib.lib;zstd.lib</AdditionalDependencies> <AdditionalDependencies>%(AdditionalDependencies);cpuinfo.lib;freetype.lib;jpeg.lib;libpng16.lib;libwebp.lib;lunasvg.lib;SDL2.lib;soundtouch.lib;zlib.lib;zstd.lib</AdditionalDependencies>