diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:29:50 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-11 23:31:02 +0200 |
| commit | 70dd5e7c66b1fe3f82e5b4db2406050baba15f05 (patch) | |
| tree | 3f012200ef3c934f33db1a4ef2b790fae3141860 /gfx/angle/src/tests/deqp.gypi | |
| parent | 3b7ffb477eec078c7036c92c6a51bb5de6de4f28 (diff) | |
| parent | 8481fa25d246f1968d0a254ee3c6cdd82c60781a (diff) | |
| download | UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.gz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.lz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.tar.xz UXP-70dd5e7c66b1fe3f82e5b4db2406050baba15f05.zip | |
Merge branch 'ANGLE-rollback'
This resolves #624
Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.
Diffstat (limited to 'gfx/angle/src/tests/deqp.gypi')
| -rwxr-xr-x | gfx/angle/src/tests/deqp.gypi | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gfx/angle/src/tests/deqp.gypi b/gfx/angle/src/tests/deqp.gypi index 1c1e3e5e2..8be7d60cb 100755 --- a/gfx/angle/src/tests/deqp.gypi +++ b/gfx/angle/src/tests/deqp.gypi @@ -1250,7 +1250,7 @@ { 'target_name': 'angle_zlib', 'type': 'static_library', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'include_dirs': [ '<(zlib_path)', @@ -1326,7 +1326,7 @@ { 'target_name': 'angle_libpng', 'type': 'static_library', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ 'angle_zlib' @@ -1547,7 +1547,6 @@ 'AdditionalOptions': [ '/bigobj', # needed for glsBuiltinPrecisionTests.cpp - '/wd4251', # needed for angle_util STL objects not having DLL interface ], }, }, @@ -1763,7 +1762,6 @@ [ 'angle_test_support', '<(angle_path)/util/util.gyp:angle_util', - '<(angle_path)/src/angle.gyp:angle_common', ], 'export_dependent_settings': [ @@ -1842,7 +1840,7 @@ { 'target_name': 'angle_deqp_gtest_gles2_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ 'angle_deqp_gtest_support', @@ -1857,7 +1855,7 @@ { 'target_name': 'angle_deqp_gtest_gles3_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ 'angle_deqp_gtest_support', @@ -1872,7 +1870,7 @@ { 'target_name': 'angle_deqp_gtest_gles31_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ 'angle_deqp_gtest_support', @@ -1887,7 +1885,7 @@ { 'target_name': 'angle_deqp_gtest_egl_tests', 'type': 'executable', - 'includes': [ '../../gyp/common_defines.gypi', ], + 'includes': [ '../../build/common_defines.gypi', ], 'dependencies': [ 'angle_deqp_gtest_support', |