AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More common_conditions simplifications.

Browse Source 
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
This commit is contained in:
mtklein@google.com 2013-11-20 18:06:10 +00:00
parent 0724e1fc2d
commit dad7070d91
1 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gyp/common_conditions.gypi
View File

@ -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' ],
},