diff --git a/modules/shader_compiler/config/JSON-C.cmake b/modules/shader_compiler/config/JSON-C.cmake index 498b933cafb5d8bd84faed49cf51e6eef9c7503b..bf864bb240a5044d55c49dd125b43eaa1497735f 100644 --- a/modules/shader_compiler/config/JSON-C.cmake +++ b/modules/shader_compiler/config/JSON-C.cmake @@ -3,7 +3,9 @@ use_git_submodule("${vkcv_shader_compiler_lib_path}/json-c" json_c_status) if (${json_c_status}) add_subdirectory(${vkcv_shader_compiler_lib}/json-c) + + set(JSON_C_INCLUDE_DIR ${vkcv_shader_compiler_lib}) list(APPEND vkcv_shader_compiler_libraries json-c) - list(APPEND vkcv_shader_compiler_includes ${vkcv_shader_compiler_lib}) + list(APPEND vkcv_shader_compiler_includes ${JSON_C_INCLUDE_DIR}) endif () diff --git a/modules/shader_compiler/config/Shady.cmake b/modules/shader_compiler/config/Shady.cmake index b5d3bf6ca2a04209806b571da740efd9ca5e0cdc..06a8a82433bc00fd643b1e618f3eac44dce33c8c 100644 --- a/modules/shader_compiler/config/Shady.cmake +++ b/modules/shader_compiler/config/Shady.cmake @@ -6,6 +6,8 @@ if (${shady_status}) set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "") set(EXTERNAL_MURMUR3 ON CACHE INTERNAL "") + set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIR} CACHE INTERNAL "") + add_subdirectory(${vkcv_shader_compiler_lib}/shady) if (vkcv_build_attribute EQUAL "SHARED") diff --git a/modules/shader_compiler/lib/shady b/modules/shader_compiler/lib/shady index defbe9e83bc4d3a5f1a5ecf5ec10db449442761a..07ad7b174107269ae1c690ae6f11fa79ed0d42aa 160000 --- a/modules/shader_compiler/lib/shady +++ b/modules/shader_compiler/lib/shady @@ -1 +1 @@ -Subproject commit defbe9e83bc4d3a5f1a5ecf5ec10db449442761a +Subproject commit 07ad7b174107269ae1c690ae6f11fa79ed0d42aa