diff options
| author |  hendrikw <hendrikw@chromium.org> | 2015-09-23 11:35:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-23 11:35:55 -0700 |
| commit | 6f0fdac9e7248c4e82ba2c9f6331694db0174bb2 (patch) | |
| tree | 439670a2bcad66651bcb37079b9e8d95ee8960c7 /gyp | |
| parent | 10cae83e4bb726610b93276e17815c5d52d73395 (diff) | |
skia: Add support for ANGLE on linux
This will allow the ANGLE guys to test the ANGLE gl backend
with nanobench and DM
Review URL: https://codereview.chromium.org/1343193005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common.gypi | 4 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 11 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 12 |
3 files changed, 24 insertions, 3 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi index a3ce66e362..46ae9f37e7 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -30,8 +30,8 @@ [ 'skia_mesa and skia_os not in ["mac", "linux"]', { 'error': '<!(skia_mesa=1 only supported with skia_os="mac" or "linux".)', }], - [ 'skia_angle and not skia_os == "win"', { - 'error': '<!(skia_angle=1 only supported with skia_os="win".)', + [ 'skia_angle and not (skia_os == "win" or skia_os == "linux")', { + 'error': '<!(skia_angle=1 only supported with skia_os="win" or skia_os="linux".)', }], [ 'skia_os == "chromeos" and OS != "linux"', { 'error': '<!(Skia ChromeOS build is only supported on Linux.)', diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 54fa54345e..60020ed23a 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -250,6 +250,17 @@ '-m32', ], }], + [ 'skia_angle == 1' , { + 'cflags!': [ + '-fstrict-aliasing', + ], + 'cflags_cc!': [ + '-Wnon-virtual-dtor', + ], + 'cflags_cc': [ + '-Wno-unknown-pragmas', + ], + }], ], }], [ 'skia_warnings_as_errors', { diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 3f122a5a78..e8a835541c 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -89,6 +89,11 @@ }, { 'os_posix%': 1, }], + [ 'skia_os == "linux"', { + # ANGLE on linux require these two variable be defined. + 'chromeos%': 0, + 'use_x11%': 1, + }], [ 'skia_os == "android"', { 'skia_static_initializers%': 0, 'skia_egl%': 1, @@ -164,6 +169,11 @@ }, { 'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)', }], + [ 'skia_os == "linux"', { + # ANGLE on linux require these two variable be defined. + 'chromeos%': 0, + 'use_x11%': 1, + }], [ 'skia_sanitizer', { 'skia_clang_build': 1, 'skia_keep_frame_pointer': 1, @@ -171,7 +181,7 @@ 'skia_clang_build%': 0, 'skia_keep_frame_pointer%': 0, }], - [ 'skia_shared_lib or skia_sanitizer or skia_os == "android"', { + [ 'skia_shared_lib or skia_sanitizer or skia_os == "android" or (skia_os == "linux" and skia_angle == 1)', { 'skia_pic%' : 1, }, { 'skia_pic%' : 0, |