diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 22:00:58 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-15 22:00:58 +0000 |
| commit | 48d5d8e862697b53adefa014da2b77dce6ccee0c (patch) | |
| tree | 60196dd38f3b04e77799045e80fc4ff484f2e88a | |
| parent | 72415161dde26f6aa2b206a8eaa0abaff2f782de (diff) | |
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@1608 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/bench.gyp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index 01aea2e687..d5a4fcf781 100644 --- a/gyp/bench.gyp +++ b/gyp/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', |