diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 18:06:10 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-20 18:06:10 +0000 |
| commit | dad7070d916614b41c17f08f3a49f42964945e1d (patch) | |
| tree | 97c634c7109c5aaaf0d26cdb73263e855899fa83 /gyp | |
| parent | 0724e1fc2d3227bded0fe9bf07f467f2ba80fa30 (diff) | |
More common_conditions simplifications.
BUG=
R=bungeman@google.com, djsollen@google.com
Review URL: https://codereview.chromium.org/78653002
git-svn-id: http://skia.googlecode.com/svn/trunk@12322 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 917298f914..9a75fffc2c 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -3,41 +3,11 @@ { 'defines': [ 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', + 'SK_SUPPORT_GPU=<(skia_gpu)', + 'SK_SUPPORT_OPENCL=<(skia_opencl)', + 'SK_DISTANCEFIELD_FONTSC=<(skia_distancefield_fonts)', ], 'conditions' : [ - [ 'skia_gpu == 1', - { - 'defines': [ - 'SK_SUPPORT_GPU=1', - ], - }, { - 'defines': [ - 'SK_SUPPORT_GPU=0', - ], - }, - ], - [ 'skia_opencl == 1', - { - 'defines': [ - 'SK_SUPPORT_OPENCL=1', - ], - }, { - 'defines': [ - 'SK_SUPPORT_OPENCL=0', - ], - }, - ], - [ 'skia_distancefield_fonts == 1', - { - 'defines': [ - 'SK_DISTANCEFIELD_FONTS=1', - ], - }, { - 'defines': [ - 'SK_DISTANCEFIELD_FONTS=0', - ], - }, - ], [ 'skia_os == "win"', { 'defines': [ @@ -150,9 +120,10 @@ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { 'cflags': [ + '-g', '-fno-exceptions', '-fstrict-aliasing', - + '-Wall', '-Wextra', '-Winit-self', @@ -231,16 +202,14 @@ ], 'configurations': { 'Coverage': { - 'cflags': ['-g --coverage'], + 'cflags': ['--coverage'], 'ldflags': ['--coverage'], }, 'Debug': { - 'cflags': ['-g'] }, 'Release': { 'cflags': [ '-O<(skia_release_optimization_level)', - '-g', ], 'defines': [ 'NDEBUG' ], }, |