aboutsummaryrefslogtreecommitdiff
path: root/samplecode/SampleApp.cpp
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2014-07-22 10:15:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-07-22 10:15:35 -0700
commit17f0b6df7248b9bbdaddacc3a6c9c6efe4ae278e (patch)
tree4e8140b396a43b1aee58cc0ab5fe84c63fbe2f3e /samplecode/SampleApp.cpp
parentac9779234ef7a8cf3d791ab7690ef8c388662836 (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 'samplecode/SampleApp.cpp')
-rw-r--r--samplecode/SampleApp.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 3f37d358ab..27365e0b87 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -2386,14 +2386,12 @@ void get_preferred_size(int* x, int* y, int* width, int* height) {
}
#ifdef SK_BUILD_FOR_IOS
-bool set_cmd_line_args(int , char *[], const char* resourceDir) {
+IOS_launch_type set_cmd_line_args(int , char *[], const char* resourceDir) {
SetResourcePath(resourceDir);
- return false;
+ return kApplication__iOSLaunchType;
}
#endif
-// FIXME: this should be in a header
-void application_init();
void application_init() {
// setenv("ANDROID_ROOT", "../../../data", 0);
#ifdef SK_BUILD_FOR_MAC
@@ -2403,8 +2401,6 @@ void application_init() {
SkEvent::Init();
}
-// FIXME: this should be in a header
-void application_term();
void application_term() {
SkEvent::Term();
SkGraphics::Term();