diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2014-11-13 05:00:57 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-13 05:00:57 -0800 |
| commit | c092d3bdab5f723576cc0346cea3ee282a9cb444 (patch) | |
| tree | d2a5ecf4ded3f126e2968d6ad7b4b05c1d536bfa /gyp | |
| parent | 5adbf1b57988eaad84d6615395c90a08b7ea225a (diff) | |
Make nanobench and dm be usable from Chromium build
Move the app logic for each app as follows:
<app>.cpp -- the file which contains main(). Embedders that compile
their own apps, such as ios shell, upcoming Chromium dm etc, do not use this.
<app>_main.cpp -- the main logic of the Skia test application. This will be
used by Skia -compiled apps as well as embedder -compiled apps.
<app>_main.h -- the API for the main logic. This will be
used by Skia -compiled apps as well as embedder -compiled apps.
This way (the upcoming) Chromium dm can setup its Chromium-specific setup
in custom main(), and then call dm_main(), without the need of any
SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not.
BUG=skia:2992
Review URL: https://codereview.chromium.org/657373002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/bench.gyp | 1 | ||||
| -rw-r--r-- | gyp/dm.gyp | 3 | ||||
| -rw-r--r-- | gyp/most.gyp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/gyp/bench.gyp b/gyp/bench.gyp index 26849d511a..e91c4f29f5 100644 --- a/gyp/bench.gyp +++ b/gyp/bench.gyp @@ -13,6 +13,7 @@ '../bench/GMBench.cpp', '../bench/RecordingBench.cpp', '../bench/SKPBench.cpp', + '../bench/nanobench_main.cpp', '../bench/nanobench.cpp', ], 'includes': [ diff --git a/gyp/dm.gyp b/gyp/dm.gyp index e4d6bd6708..0e5eebd416 100644 --- a/gyp/dm.gyp +++ b/gyp/dm.gyp @@ -8,6 +8,9 @@ 'includes': [ 'dm.gypi', ], + 'sources': [ + '../dm/dm_main.cpp', + ], 'conditions': [ ['skia_android_framework', { 'libraries': [ '-lskia' ], diff --git a/gyp/most.gyp b/gyp/most.gyp index e22629ae74..61efe1e455 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -29,7 +29,7 @@ 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ['skia_os == "ios"', { - 'dependencies!': [ 'SampleApp.gyp:SampleApp' ], + 'dependencies!': [ 'SampleApp.gyp:SampleApp', 'dm.gyp:dm', 'bench.gyp:*' ], 'dependencies': ['iOSShell.gyp:iOSShell' ], }], ['skia_os == "mac" or skia_os == "linux"', { |