diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
| commit | 6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19 (patch) | |
| tree | ac02524310011c60f7d4f5255f1df5b592b4ca5c /o3d/DEPS_gyp | |
| parent | 05c453db1e7a357eb2cc1b6ac67ff32a5256bb19 (diff) | |
| download | chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.zip chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.gz chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.bz2 | |
This completes the building of o3d.msi from the GYP build.
Review URL: http://codereview.chromium.org/164044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/DEPS_gyp')
| -rw-r--r-- | o3d/DEPS_gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index a68b921..950f915 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -1,10 +1,10 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", "nixysa_rev": "29", - "chromium_rev": "21287", - "o3d_code_rev": "109", + "chromium_rev": "22547", + "o3d_code_rev": "113", "skia_rev": "279", - "gyp_rev": "563", + "gyp_rev": "579", "gtest_rev": "267", "gflags_rev": "30", "breakpad_rev": "346", @@ -43,9 +43,6 @@ deps = { "third_party/vectormath": "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"), - "third_party/wix_2_0_4221": - "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"), - "third_party/zip_utils": "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"), @@ -127,6 +124,9 @@ deps = { deps_os = { "win": { + "third_party/wix_2_0_4221": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"), + "third_party/cygwin": "/trunk/deps/third_party/cygwin@11984", |