encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEPS: update toolchain files to not require GYP 

build/vs_toolchain.py used to require GYP that we don't have, update it
past a commit that removes that requirement.
This commit is contained in:
Corentin Wallez 2018-08-13 17:48:16 +02:00 committed by Corentin Wallez
parent c28936043a
commit 682c44af92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DEPS
View File

@ -9,21 +9,21 @@ vars = {
deps = { deps = {
# Dependencies required to use GN/Clang in standalone # Dependencies required to use GN/Clang in standalone
'{dawn_root}/build': { '{dawn_root}/build': {
'url': '{chromium_git}/chromium/src/build.git@b944b99e72923c5a6699235ed858e725db21f81f', 'url': '{chromium_git}/chromium/src/build.git@ddcfe1a1c6428569cb8c900735be3567358bc6ee',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },
'{dawn_root}/buildtools': { '{dawn_root}/buildtools': {
'url': '{chromium_git}/chromium/buildtools.git@94288c26d2ffe3aec9848c147839afee597acefd', 'url': '{chromium_git}/chromium/buildtools.git@9a90d9aaadeb5e04327ed05775f45132e4b3523f',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },
'{dawn_root}/tools/clang': { '{dawn_root}/tools/clang': {
'url': '{chromium_git}/chromium/src/tools/clang.git@c893c7eec4706f8c7fc244ee254b1dadd8f8d158', 'url': '{chromium_git}/chromium/src/tools/clang.git@d299f069f8d1dca337354ced634df7a78e4512f7',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },
# Testing, GTest and GMock # Testing, GTest and GMock
'{dawn_root}/testing': { '{dawn_root}/testing': {
'url': '{chromium_git}/chromium/src/testing@4d706fd80be9e8989aec5235540e7b46d0672826', 'url': '{chromium_git}/chromium/src/testing@b07830f6905ce9e33034ad14820bc0a58b6e9e41',
'condition': 'dawn_standalone', 'condition': 'dawn_standalone',
}, },
'{dawn_root}/third_party/googletest': { '{dawn_root}/third_party/googletest': {
@ -165,7 +165,7 @@ hooks = [
'--arch=x64'], '--arch=x64'],
}, },
{ {
# Update the Windows toolchain if necessary. Must run before 'clang' below. # Update the Windows toolchain if necessary. Must run before 'clang' below.
'name': 'win_toolchain', 'name': 'win_toolchain',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_win and dawn_standalone', 'condition': 'checkout_win and dawn_standalone',