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/angle.gyp | |
| 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/angle.gyp')
| -rwxr-xr-x | gfx/angle/src/angle.gyp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gfx/angle/src/angle.gyp b/gfx/angle/src/angle.gyp index e4e8ba979..f84436d75 100755 --- a/gfx/angle/src/angle.gyp +++ b/gfx/angle/src/angle.gyp @@ -45,7 +45,6 @@ 'angle_enable_gl%': 1, }], ], - 'angle_enable_null%': 1, # Available on all platforms }, 'includes': [ @@ -59,7 +58,7 @@ { 'target_name': 'angle_common', 'type': 'static_library', - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'sources': [ '<@(libangle_common_sources)', @@ -146,7 +145,7 @@ { 'target_name': 'angle_image_util', 'type': 'static_library', - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'sources': [ '<@(libangle_image_util_sources)', @@ -173,7 +172,7 @@ { 'target_name': 'copy_scripts', 'type': 'none', - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'hard_dependency': 1, 'copies': [ @@ -200,7 +199,7 @@ { 'target_name': 'commit_id', 'type': 'none', - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'dependencies': [ 'copy_scripts', ], 'hard_dependency': 1, 'actions': @@ -242,7 +241,7 @@ 'target_name': 'commit_id', 'type': 'none', 'hard_dependency': 1, - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'copies': [ { @@ -275,7 +274,7 @@ 'target_name': 'copy_compiler_dll', 'type': 'none', 'dependencies': [ 'copy_scripts', ], - 'includes': [ '../gyp/common_defines.gypi', ], + 'includes': [ '../build/common_defines.gypi', ], 'conditions': [ ['angle_build_winrt==0', |