diff options
| author |  caryclark <caryclark@google.com> | 2014-07-22 10:15:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-22 10:15:35 -0700 |
| commit | 17f0b6df7248b9bbdaddacc3a6c9c6efe4ae278e (patch) | |
| tree | 4e8140b396a43b1aee58cc0ab5fe84c63fbe2f3e /include/views | |
| parent | ac9779234ef7a8cf3d791ab7690ef8c388662836 (diff) | |
share dm and command flags
Share command flags between dm and unit tests.
Also, allow dm's core to be included by itself and iOSShell.
Command line flags that are the same (or nearly the same) in DM
and in skia_tests have been moved to common_flags. Authors,
please check to see that the shared common flag is correct for
the tool.
For iOS, the 'tool_main' entry point has a wrapper to allow multiple
tools to be statically linked in the iOSShell.
Since SkCommandLineFlags::Parse can only be called once, these calls
are disabled in the IOS build.
Since the iOS app directory is dynamically assigned a name, use '@' to
select it. (This is the same convention chosen by the Mobile Harness
iOS file system utilities.)
Move the heart of dm.gyp into dm.gypi so that it can be included by
itself and iOSShell.gyp.
Add tools/flags/SkCommonFlags.* to define and declare common
command line flags.
Add support for dm to iOSShell.
BUG=skia:
R=scroggo@google.com, mtklein@google.com, jvanverth@google.com, bsalomon@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/389653004
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkApplication.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/views/SkApplication.h b/include/views/SkApplication.h index 8369f68a76..8f63539a30 100644 --- a/include/views/SkApplication.h +++ b/include/views/SkApplication.h @@ -16,4 +16,15 @@ extern SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv); extern void application_init(); extern void application_term(); +#ifdef SK_BUILD_FOR_IOS +enum IOS_launch_type { + kError_iOSLaunchType = -1, + kTool_iOSLaunchType = 0, + kApplication__iOSLaunchType = 1 +}; + +extern IOS_launch_type set_cmd_line_args(int argc, char *argv[], + const char* resourceDir); +#endif + #endif // SkApplication_DEFINED |