From 1cd3f207c547818499dff6b6e687eb4e55f335c9 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 13 Nov 2021 14:06:39 +0100 Subject: [PATCH] Re-Organize Vulkan build order a bit --- scripts.d/{45-vulkan => 50-vulkan}/45-vulkan.sh | 0 scripts.d/{45-vulkan => 50-vulkan}/50-glslang.sh | 1 + scripts.d/{45-vulkan => 50-vulkan}/55-spirv-cross.sh | 0 scripts.d/{50-libplacebo.sh => 50-vulkan/60-libplacebo.sh} | 0 4 files changed, 1 insertion(+) rename scripts.d/{45-vulkan => 50-vulkan}/45-vulkan.sh (100%) rename scripts.d/{45-vulkan => 50-vulkan}/50-glslang.sh (94%) rename scripts.d/{45-vulkan => 50-vulkan}/55-spirv-cross.sh (100%) rename scripts.d/{50-libplacebo.sh => 50-vulkan/60-libplacebo.sh} (100%) diff --git a/scripts.d/45-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh similarity index 100% rename from scripts.d/45-vulkan/45-vulkan.sh rename to scripts.d/50-vulkan/45-vulkan.sh diff --git a/scripts.d/45-vulkan/50-glslang.sh b/scripts.d/50-vulkan/50-glslang.sh similarity index 94% rename from scripts.d/45-vulkan/50-glslang.sh rename to scripts.d/50-vulkan/50-glslang.sh index 7c9e642..5604bf0 100755 --- a/scripts.d/45-vulkan/50-glslang.sh +++ b/scripts.d/50-vulkan/50-glslang.sh @@ -4,6 +4,7 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git" GLSLANG_COMMIT="d1608ab1ef17f1488bdcbfe11f2c3c96ac482fce" ffbuild_enabled() { + [[ $ADDINS_STR == *4.4* ]] && return -1 return 0 } diff --git a/scripts.d/45-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh similarity index 100% rename from scripts.d/45-vulkan/55-spirv-cross.sh rename to scripts.d/50-vulkan/55-spirv-cross.sh diff --git a/scripts.d/50-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh similarity index 100% rename from scripts.d/50-libplacebo.sh rename to scripts.d/50-vulkan/60-libplacebo.sh