| Index: gyp/tools.gyp
|
| diff --git a/gyp/tools.gyp b/gyp/tools.gyp
|
| index a4f8cfd62ab9ccea85060ad32dc63ec9fff9cb5e..c25543ef2d46bb269b91e81f349b69bafc3f078d 100644
|
| --- a/gyp/tools.gyp
|
| +++ b/gyp/tools.gyp
|
| @@ -132,11 +132,39 @@
|
| {
|
| 'target_name' : 'timer',
|
| 'type': 'static_library',
|
| - 'sources': [ '../tools/timer/Timer.cpp' ],
|
| + 'sources': [
|
| + '../tools/timer/Timer.cpp',
|
| + '../tools/timer/TimerData.cpp',
|
| + ],
|
| + 'include_dirs': [
|
| + '../include/private',
|
| + '../src/core',
|
| + '../src/gpu',
|
| + ],
|
| 'direct_dependent_settings': {
|
| 'include_dirs': ['../tools/timer'],
|
| },
|
| - 'dependencies': [ 'skia_lib.gyp:skia_lib' ],
|
| + 'dependencies': [
|
| + 'skia_lib.gyp:skia_lib',
|
| + 'jsoncpp.gyp:jsoncpp',
|
| + ],
|
| + 'conditions': [
|
| + ['skia_gpu == 1', {
|
| + 'sources': [ '../tools/timer/GpuTimer.cpp' ],
|
| + }],
|
| + [ 'skia_os in ["mac", "ios"]', {
|
| + 'sources': [ '../tools/timer/SysTimer_mach.cpp' ],
|
| + }],
|
| + [ 'skia_os == "win"', {
|
| + 'sources': [ '../tools/timer/SysTimer_windows.cpp' ],
|
| + }],
|
| + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', {
|
| + 'sources': [ '../tools/timer/SysTimer_posix.cpp' ],
|
| + }],
|
| + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
|
| + 'link_settings': { 'libraries': [ '-lrt' ] },
|
| + }],
|
| + ],
|
| },
|
| {
|
| 'target_name': 'skdiff',
|
|
|