commit 4d11fe229b2c736b6691818e099202874c57cae5
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 27 15:43:22 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Nov 27 15:43:22 2013 +0000
tree ada236c478c95975b8a895c96bb2a2ad972eecf1
parent bd8902a4b5edcf536b88758442de580afb2ceffd

move to newer angle

R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12416 2bbb7eff-a529-9590-31e7-b0007b416f81

angle.gyp

diff --git a/angle.gyp b/angle.gyp
index 2a88d56..2b38abf 100644
--- a/angle.gyp
+++ b/angle.gyp
@@ -4,9 +4,30 @@
   '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',