Skip to content
Snippets Groups Projects
Unverified Commit 2494960b authored by Jacki's avatar Jacki
Browse files

Drop murmur3 submodule


Signed-off-by: default avatarJacki <jacki@thejackimonster.de>
parent 65215d48
No related branches found
No related tags found
No related merge requests found
......@@ -76,9 +76,6 @@
[submodule "modules/shader_compiler/lib/SPIRV-Headers"]
path = modules/shader_compiler/lib/SPIRV-Headers
url = https://github.com/KhronosGroup/SPIRV-Headers.git
[submodule "modules/shader_compiler/lib/murmur3"]
path = modules/shader_compiler/lib/murmur3
url = https://github.com/PeterScott/murmur3.git
[submodule "modules/shader_compiler/lib/json-c"]
path = modules/shader_compiler/lib/json-c
url = https://github.com/json-c/json-c.git
......
......@@ -52,8 +52,7 @@ include(config/SPIRV-Headers.cmake)
# Check and load GLSLANG
include(config/GLSLANG.cmake)
# Check and load Shady (with murmur3)
include(config/Murmur3.cmake)
# Check and load Shady
include(config/Shady.cmake)
# Check and load SLANG
......
use_git_submodule("${vkcv_shader_compiler_lib_path}/murmur3" murmur3_status)
if (${murmur3_status})
add_library(murmur3 STATIC ${vkcv_shader_compiler_lib}/murmur3/murmur3.c)
target_include_directories(murmur3 INTERFACE ${vkcv_shader_compiler_lib}/murmur3)
set_target_properties(murmur3 PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif ()
......@@ -4,7 +4,6 @@ use_git_submodule("${vkcv_shader_compiler_lib_path}/shady" shady_status)
if (${shady_status})
set(EXTERNAL_JSON_C ON CACHE INTERNAL "")
set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "")
set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIR} CACHE INTERNAL "")
set(BUILD_RUNTIME OFF CACHE INTERNAL "")
......
Subproject commit dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment