diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-14 14:09:24 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-05-14 14:09:24 +0000 |
| commit | 554875210043b34178f7ed6ac5bd682b1fad367b (patch) | |
| tree | fdadeb167ef502f98784117a3c05378c72fceeec /gyp | |
| parent | f105b109264f71dfb0bfd9977e6a5dd0a5a12f57 (diff) | |
Add bench and test for SkRefCnt.
http://codereview.appspot.com/6195071/
This also adds a cross platform SkThread for testing purposes.
git-svn-id: http://skia.googlecode.com/svn/trunk@3921 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gypi | 1 | ||||
| -rw-r--r-- | gyp/tests.gyp | 1 | ||||
| -rw-r--r-- | gyp/utils.gyp | 23 |
3 files changed, 25 insertions, 0 deletions
diff --git a/gyp/bench.gypi b/gyp/bench.gypi index 8499ca137f..221faed9d8 100644 --- a/gyp/bench.gypi +++ b/gyp/bench.gypi @@ -33,6 +33,7 @@ '../bench/PathIterBench.cpp', '../bench/PicturePlaybackBench.cpp', '../bench/RectBench.cpp', + '../bench/RefCntBench.cpp', '../bench/RegionBench.cpp', '../bench/RepeatTileBench.cpp', '../bench/ScalarBench.cpp', diff --git a/gyp/tests.gyp b/gyp/tests.gyp index e7d5724cda..ec850a4923 100644 --- a/gyp/tests.gyp +++ b/gyp/tests.gyp @@ -61,6 +61,7 @@ '../tests/Reader32Test.cpp', '../tests/ReadPixelsTest.cpp', '../tests/ReadWriteAlphaTest.cpp', + '../tests/RefCntTest.cpp', '../tests/RefDictTest.cpp', '../tests/RegionTest.cpp', '../tests/ScalarTest.cpp', diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 2fca63fbfe..d2c413ecbc 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -56,6 +56,14 @@ '../src/utils/SkParsePath.cpp', '../src/utils/SkProxyCanvas.cpp', '../src/utils/SkSfntUtils.cpp', + '../src/utils/SkThreadUtils.h', + '../src/utils/SkThreadUtils_pthread.cpp', + '../src/utils/SkThreadUtils_pthread.h', + '../src/utils/SkThreadUtils_pthread_linux.cpp', + '../src/utils/SkThreadUtils_pthread_mach.cpp', + '../src/utils/SkThreadUtils_pthread_other.cpp', + '../src/utils/SkThreadUtils_win.cpp', + '../src/utils/SkThreadUtils_win.h', '../src/utils/SkUnitMappers.cpp', #mac @@ -87,6 +95,9 @@ '../include/utils/mac', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os != "mac"' 'include_dirs!': [ '../include/utils/mac', @@ -94,6 +105,7 @@ 'sources!': [ '../include/utils/mac/SkCGUtils.h', '../src/utils/mac/SkCreateCGImageRef.cpp', + '../src/utils/SkThreadUtils_pthread_mach.cpp', ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { @@ -103,10 +115,16 @@ '-lGLU', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]' 'include_dirs!': [ '../include/utils/unix', ], + 'sources!': [ + '../src/utils/SkThreadUtils_pthread_linux.cpp', + ], }], [ 'skia_os == "win"', { 'direct_dependent_settings': { @@ -114,6 +132,11 @@ '../include/utils/win', ], }, + 'sources!': [ + '../src/utils/SkThreadUtils_pthread.cpp', + '../src/utils/SkThreadUtils_pthread.h', + '../src/utils/SkThreadUtils_pthread_other.cpp', + ], },{ #else if 'skia_os != "win"' 'include_dirs!': [ '../include/utils/win', |