diff options
| author |  rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 13:50:38 +0000 |
|---|---|---|
| committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 13:50:38 +0000 |
| commit | d6bab0238655dbab24dfe92bd0b16b464310a8c7 (patch) | |
| tree | 664de29dd3b91a1ed1be463f2cd797e871cabec7 /gyp/angle.gyp | |
| parent | 5b39f5ba9c339d1e4dae391fee9ec1396feec180 (diff) | |
Reverting r12427
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/angle.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', |