diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 20:20:50 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 20:20:50 +0000 |
| commit | 1d146d431ac6078008d06a38aecd2424a8ff0679 (patch) | |
| tree | ed0be08b5245799c839a2bbf304e114fc4085e2f /gyp | |
| parent | 1e2a0cba3734bea5ec628259fcc913f9cbcd2ee6 (diff) | |
Revert of Roll ANGLE. (https://codereview.chromium.org/237173002/)
Reason for revert:
breaking the buildbots (see http://108.170.220.76:10117/builders/Build-Win7-VS2010-x86-Release-ANGLE/builds/3198).
NOTRY=true
Original issue's description:
> Roll ANGLE.
>
> BUG=skia:2272
>
> Committed: http://code.google.com/p/skia/source/detail?r=14243
>
> Committed: http://code.google.com/p/skia/source/detail?r=14509
R=bsalomon@chromium.org, bsalomon@google.com, geofflang@chromium.org, djsollen@google.com, mtklein@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/264733006
git-svn-id: http://skia.googlecode.com/svn/trunk@14517 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/angle.gyp | 45 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 1 |
2 files changed, 39 insertions, 7 deletions
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 817c4a1f95..6ae76a61dd 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', |