diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-27 15:43:22 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-27 15:43:22 +0000 |
commit | 361270e6b9226fe7aad94cfbf2f01b16152d82b2 (patch) | |
tree | 6471d480609160368e62493752875db09f8c8417 /gyp | |
parent | 43c465f2bdc449d9c090bf9e4d6e4080a74b6622 (diff) |
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@12416 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/angle.gyp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gyp/angle.gyp b/gyp/angle.gyp index 2a88d56b60..2b38abfe8a 100644 --- a/gyp/angle.gyp +++ b/gyp/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', |