summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-15 22:00:58 +0000
committerbungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-06-15 22:00:58 +0000
commit9ac05818a7a59b6f41bf72843e698d011963e90b (patch)
tree6b6df4a46dbd2e51edb532c854af516f3e2e5e66
parentc16081177cf4aead3b1a335afe779def9fabb0a2 (diff)
downloadgyp-9ac05818a7a59b6f41bf72843e698d011963e90b.tar.gz
Put Matirx and Scalar benches into gyp.
The Matrix and Scalar benches were in the old Makefile, but did not make it into gyp. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@1608 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--bench.gyp9
1 files changed, 4 insertions, 5 deletions
diff --git a/bench.gyp b/bench.gyp
index 01aea2e..d5a4fcf 100644
--- a/bench.gyp
+++ b/bench.gyp
@@ -37,9 +37,11 @@
'../bench/DecodeBench.cpp',
'../bench/FPSBench.cpp',
'../bench/GradientBench.cpp',
+ '../bench/MatrixBench.cpp',
'../bench/PathBench.cpp',
'../bench/RectBench.cpp',
'../bench/RepeatTileBench.cpp',
+ '../bench/ScalarBench.cpp',
'../bench/TextBench.cpp',
],
'dependencies': [
@@ -62,8 +64,7 @@
'../bench/BenchSysTimer_posix.h',
'../bench/BenchSysTimer_posix.cpp',
],
- }],
- [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', {
+ },{
'link_settings': {
'libraries': [
'-lrt',
@@ -76,14 +77,12 @@
'../bench/BenchSysTimer_windows.cpp',
],
}],
-
[ 'OS in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', {
'sources!': [
'../bench/BenchGpuTimer_none.h',
'../bench/BenchGpuTimer_none.cpp',
],
- }],
- [ 'OS not in ["win", "mac", "linux", "freebsd", "openbsd", "solaris"]', {
+ },{
'sources!': [
'../bench/BenchGpuTimer_gl.h',
'../bench/BenchGpuTimer_gl.cpp',