aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Kniager <jeremyk@lunarg.com>2019-09-03 13:38:52 -0600
committerjeremyk-lunarg <jeremyk@lunarg.com>2019-09-04 11:00:34 -0600
commit9835692a976c3c17847d08bf74937ad8188b694b (patch)
treecc313fc26f53765d3b522659e8043a326db4c053 /scripts
parent5e453384b73751d471467b34bb3e4e19e1073b96 (diff)
downloadusermoji-9835692a976c3c17847d08bf74937ad8188b694b.tar.xz
build: Fix known-good MoltenVK building
MoltenVK seems to have trouble building on the current version of Vulkan-Headers. Since Vulkan-Headers doesn't take very long to build and changes often, this fix removes the reuse of the Vulkan-Headers repo, whose version is provided by Vulkan-Tools known-good.json, in the MoltenVK build. It instead uses the version of Vulkan-Headers provided by the MoltenVK known-good when building MoltenVK. **Note:** Vulkan-Tools and other required repos are still built with the version of Vulkan-Headers provided by Vulkan-Tools known-good.json. Change-Id: I1b11122cf0c6ba488acd53a35e4755f00e48376c
Diffstat (limited to 'scripts')
-rw-r--r--scripts/known_good.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 7adfa728..dcacc861 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -27,7 +27,7 @@
"install_dir" : "MoltenVK",
"commit" : "v1.0.36",
"custom_build" : [
- "./fetchDependencies --v-headers-root {0[Vulkan-Headers][repo_dir]} --glslang-root {0[glslang][repo_dir]}",
+ "./fetchDependencies --glslang-root {0[glslang][repo_dir]}",
"xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_CONFIG_LOG_LEVEL=1' -scheme \"MoltenVK Package\" build"
],
"build_step" : "custom",