From 0b17feaa64240a25b3367011e43cf62515486aad Mon Sep 17 00:00:00 2001
From: "commit-bot@chromium.org"
 <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 17 Apr 2014 21:31:32 +0000
Subject: Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)

Reason for revert:
http://skbug.com/2437

Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243

R=bsalomon@chromium.org, geofflang@chromium.org
TBR=bsalomon@chromium.org, geofflang@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:2272

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/238863006

git-svn-id: http://skia.googlecode.com/svn/trunk@14248 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 gyp/angle.gyp              | 45 +++++++++++++++++++++++++++++++++++++++------
 gyp/common_conditions.gypi |  1 -
 2 files changed, 39 insertions(+), 7 deletions(-)

(limited to 'gyp')

diff --git a/gyp/angle.gyp b/gyp/angle.gyp
index 467c7fb4ba..616de1eede 100644
--- a/gyp/angle.gyp
+++ b/gyp/angle.gyp
@@ -1,6 +1,43 @@
-# ANGLE is the Windows-specific translator from OGL ES to D3D
+# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9
 
 {
+  'conditions': [
+    [ 'skia_angle', {
+      'target_defaults': {
+        'include_dirs': [
+          '$(DXSDK_DIR)/Include',
+        ],
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'conditions': [
+              [ 'skia_arch_width == 32 ', {
+                'AdditionalLibraryDirectories': [
+                  '$(DXSDK_DIR)/Lib/x86',
+                ],
+              },{
+                'AdditionalLibraryDirectories': [
+                  '$(DXSDK_DIR)/Lib/x64',
+                ],
+              }],
+            ],
+          },
+        },
+        'defines': [
+          'NOMINMAX',
+        ],
+        'defines/': [
+          ['exclude', 'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'],
+        ],
+      },
+      'variables': {
+        'component': 'static_library',
+        'skia_warnings_as_errors': 0,
+      },
+      'includes': [
+        '../third_party/externals/angle/src/build_angle.gypi',
+      ],
+    }],
+  ],
   'targets': [
     {
       'target_name': 'angle',
@@ -9,13 +46,9 @@
         [ 'skia_angle', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '../third_party/externals/angle2/include',
+              '../third_party/externals/angle/include',
             ],
           },
-          'dependencies': [
-            '../third_party/externals/angle2/src/angle.gyp:libEGL',
-            '../third_party/externals/angle2/src/angle.gyp:libGLESv2',
-          ],
         }],
       ],
     },
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 9a86d492a3..46c632e543 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -22,7 +22,6 @@
           'GR_GL_FUNCTION_TYPE=__stdcall',
         ],
         'msvs_cygwin_shell': 0,
-        'msvs_disabled_warnings': [4275],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'WarningLevel': '3',
-- 
cgit v1.2.3