diff options
| author | Geoff Lang <geofflang@chromium.org> | 2013-11-20 14:30:52 -0500 |
|---|---|---|
| committer | Shannon Woods <shannonwoods@chromium.org> | 2013-11-22 12:05:50 -0500 |
| commit | bbdab83b940e3107654042e970fb1473b5106ae6 (patch) | |
| tree | 24dc60ea8e99376a6e5d0c57b7fa3eb26a6d6622 | |
| parent | f87dd56915d18bdc2a9f466f939e443d53dd08b0 (diff) | |
| download | angle_dx11-bbdab83b940e3107654042e970fb1473b5106ae6.tar.gz | |
Update gclient configuation for DEPS and git repository.
Change-Id: I49845a0a4e660027dd817b7a783163c1aa5d04d7
| -rw-r--r-- | .gclient | 7 | ||||
| -rw-r--r-- | DEPS | 14 | ||||
| -rw-r--r-- | build/gyp_angle | 2 | ||||
| -rw-r--r-- | tests/build_tests.gyp | 16 |
4 files changed, 31 insertions, 8 deletions
diff --git a/.gclient b/.gclient new file mode 100644 index 00000000..77bf7d28 --- /dev/null +++ b/.gclient @@ -0,0 +1,7 @@ +solutions = [ { + u'managed': False, + u'name': u'.', + u'url': u'https://chromium.googlesource.com/angle/angle', + u'custom_deps': { }, + u'deps_file': u'DEPS' +} ]
\ No newline at end of file @@ -1,18 +1,18 @@ deps = { - "trunk/third_party/gyp": - "http://gyp.googlecode.com/svn/trunk@1564", + "third_party/gyp": + "http://gyp.googlecode.com/svn/trunk@1767", - "trunk/third_party/googletest": - "http://googletest.googlecode.com/svn/trunk@573", #release 1.6.0 + "third_party/googletest": + "http://googletest.googlecode.com/svn/trunk@629", - "trunk/third_party/googlemock": - "http://googlemock.googlecode.com/svn/trunk@387", #release 1.6.0 + "third_party/googlemock": + "http://googlemock.googlecode.com/svn/trunk@410", } hooks = [ { # A change to a .gyp, .gypi, or to GYP itself should run the generator. "pattern": ".", - "action": ["python", "trunk/build/gyp_angle"], + "action": ["python", "build/gyp_angle"], }, ] diff --git a/build/gyp_angle b/build/gyp_angle index 2aa38a52..6533d367 100644 --- a/build/gyp_angle +++ b/build/gyp_angle @@ -25,7 +25,7 @@ if __name__ == '__main__': # Set the depth to get the top-level Makefile generated into the # correct directory. This only has an effect on Linux. args.append('--depth'); - args.append('./trunk'); + args.append('.'); # Add common.gypi to the include path. args.append('-I' + os.path.join(script_dir, 'common.gypi')) # Add all.gyp as the main gyp file to be generated. diff --git a/tests/build_tests.gyp b/tests/build_tests.gyp index aa930f17..d485c834 100644 --- a/tests/build_tests.gyp +++ b/tests/build_tests.gyp @@ -14,6 +14,14 @@ 'sources': [ '../third_party/googletest/src/gtest-all.cc', ], + 'defines': [ + '_VARIADIC_MAX=10', + ], + 'direct_dependent_settings': { + 'defines': [ + '_VARIADIC_MAX=10', + ], + }, }, { 'target_name': 'gmock', @@ -26,6 +34,14 @@ 'sources': [ '../third_party/googlemock/src/gmock-all.cc', ], + 'defines': [ + '_VARIADIC_MAX=10', + ], + 'direct_dependent_settings': { + 'defines': [ + '_VARIADIC_MAX=10', + ], + }, }, { 'target_name': 'preprocessor_tests', |