aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-14 18:49:19 +0000
committerGravatar humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-01-14 18:49:19 +0000
commit7af56bee17764a0c118c8856a035bb3d27766969 (patch)
tree403db31d9a78f6102707544e334361dd92ac99d7 /gyp
parent50dd41017ad121b5f40f063d813ba517668fcfbc (diff)
Runtime configuration system for skia. This will allow developers to control settings at launch time without relying on compile-time flags or recompilation. It can be used to turn features on and off, as well as to control numeric quantities to 'tune' algorithms. Once I make sure it's working across all platforms I'll send out a quick tutorial on its use.
Review URL: https://codereview.appspot.com/7098051 git-svn-id: http://skia.googlecode.com/svn/trunk@7158 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common.gypi7
-rw-r--r--gyp/core.gyp1
-rw-r--r--gyp/gpu.gyp2
-rw-r--r--gyp/utils.gyp2
4 files changed, 12 insertions, 0 deletions
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 7dc27da143..810a0f81f5 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -82,6 +82,7 @@
'defines': [
'SK_DEBUG',
'GR_DEBUG=1',
+ 'SK_DEVELOPER=1',
],
},
'Release': {
@@ -90,6 +91,12 @@
'GR_RELEASE=1',
],
},
+ 'Release_Developer': {
+ 'inherit_from': ['Release'],
+ 'defines': [
+ 'SK_DEVELOPER=1',
+ ],
+ },
},
}, # end 'target_defaults'
}
diff --git a/gyp/core.gyp b/gyp/core.gyp
index eddb9400c7..7e7640c639 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -17,6 +17,7 @@
'../include/core',
'../include/pipe',
'../include/ports',
+ '../include/utils',
'../include/xml',
'../src/core',
'../src/image',
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 7438babe59..6c599e162a 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -127,6 +127,7 @@
'include_dirs': [
'../include/config',
'../include/core',
+ '../include/utils',
'../src/core',
'../include/gpu',
'../src/gpu',
@@ -177,6 +178,7 @@
'include_dirs': [
'../include/core',
'../include/config',
+ '../include/utils',
'../include/gpu',
'../src/core', # SkRasterClip.h
'../src/gpu'
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index cd44769fbe..d4942d781a 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -47,6 +47,7 @@
'../include/utils/SkParsePaint.h',
'../include/utils/SkParsePath.h',
'../include/utils/SkPictureUtils.h',
+ '../include/utils/SkRTConf.h',
'../include/utils/SkProxyCanvas.h',
'../include/utils/SkUnitMappers.h',
'../include/utils/SkWGL.h',
@@ -81,6 +82,7 @@
'../src/utils/SkParsePath.cpp',
'../src/utils/SkPictureUtils.cpp',
'../src/utils/SkProxyCanvas.cpp',
+ '../src/utils/SkRTConf.cpp',
'../src/utils/SkThreadUtils.h',
'../src/utils/SkThreadUtils_pthread.cpp',
'../src/utils/SkThreadUtils_pthread.h',