From 4f2ecd53a9daaf88bb7d075745eefb6e2e4741e0 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 11 Jul 2018 18:11:13 +0200
Subject: Roll back to ANGLE/2845

---
 gfx/angle/src/tests/deqp.gypi | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'gfx/angle/src/tests/deqp.gypi')

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',
-- 
cgit v1.2.3