aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Kniager <jeremyk@lunarg.com>2018-11-09 15:34:16 -0700
committerjeremyk-lunarg <jeremyk@lunarg.com>2018-11-13 11:52:40 -0700
commit2a8dd20c081257b3c036e1d7e94557a9ab3ff437 (patch)
tree3224920610d1bcdd8472d5663a94506e3d1ed53a /scripts
parentf08e327b161dbb96223bf1687c7304096e63c064 (diff)
downloadusermoji-2a8dd20c081257b3c036e1d7e94557a9ab3ff437.tar.xz
build: Update MoltenVK commit and CMake files
Update MoltenVK commit ID in known_good.json and modified CMake files for cube, cubepp, and vulkaninfo to accomidate the new file structure of the MoltenVK repo. Change-Id: I229aa1403b5d1d47060560876b177ae93190391e
Diffstat (limited to 'scripts')
-rw-r--r--scripts/known_good.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/known_good.json b/scripts/known_good.json
index f30d790b..bf43f876 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -25,10 +25,10 @@
"sub_dir" : "MoltenVK",
"build_dir" : "MoltenVK",
"install_dir" : "MoltenVK",
- "commit" : "e651841e67e6faddaaa8e5848d248c4b1b7ad3cf",
+ "commit" : "9517c58dbdf1b4c269bd700b346361a5dc01f1c0",
"custom_build" : [
"./fetchDependencies --v-headers-root {0[Vulkan-Headers][repo_dir]} --glslang-root {0[glslang][repo_dir]}",
- "xcodebuild -project MoltenVKPackaging.xcodeproj -scheme \"MoltenVK Package ({2})\" build"
+ "xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_LOGGING_ENABLED=0' -scheme \"MoltenVK Package\" build"
],
"build_step" : "custom",
"build_platforms" : [
@@ -41,7 +41,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "9f59673982ff0ef7614adbe4c698b79aef1eaedb",
+ "commit" : "870e969fce61dca455a8339f114d331520486ec0",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",