diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 19:22:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-01 19:22:22 +0000 |
| commit | 4a508afd459a7e2e8930719d50303a26d07bceab (patch) | |
| tree | b0259ba168cf82ddd2d453f21511740b055de4e9 | |
| parent | 0eeb9c68a7d8629935845dd62b56103533f98ee7 (diff) | |
| download | gyp-4a508afd459a7e2e8930719d50303a26d07bceab.tar.gz | |
Roll ANGLE.
BUG=skia:2272
Committed: http://code.google.com/p/skia/source/detail?r=14243
R=bsalomon@chromium.org, bsalomon@google.com
Author: geofflang@chromium.org
Review URL: https://codereview.chromium.org/237173002
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@14509 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | angle.gyp | 45 | ||||
| -rw-r--r-- | common_conditions.gypi | 1 |
2 files changed, 7 insertions, 39 deletions
@@ -1,43 +1,6 @@ -# ANGLE is the Windows-specific translator from OGL ES 2.0 to D3D 9 +# ANGLE is the Windows-specific translator from OGL ES to D3D { - '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', @@ -46,9 +9,13 @@ [ 'skia_angle', { 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/angle/include', + '../third_party/externals/angle2/include', ], }, + 'dependencies': [ + '../third_party/externals/angle2/src/angle.gyp:libEGL', + '../third_party/externals/angle2/src/angle.gyp:libGLESv2', + ], }], ], }, diff --git a/common_conditions.gypi b/common_conditions.gypi index e89d116..39ee953 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -22,6 +22,7 @@ 'GR_GL_FUNCTION_TYPE=__stdcall', ], 'msvs_cygwin_shell': 0, + 'msvs_disabled_warnings': [4275], 'msvs_settings': { 'VCCLCompilerTool': { 'WarningLevel': '3', |