From e191b16fda2f5afea3a90653c1cd4f5a3c436e89 Mon Sep 17 00:00:00 2001 From: "reed@android.com" Date: Fri, 18 Dec 2009 21:33:39 +0000 Subject: update windows port git-svn-id: http://skia.googlecode.com/svn/trunk@461 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleApp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'samplecode/SampleApp.cpp') diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 84ce0d2d05..3947bdc832 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -11,7 +11,7 @@ #include "SampleCode.h" -SkView* create_overview(int, const SkViewFactory*); +extern SkView* create_overview(int, const SkViewFactory[]); //#define SK_SUPPORT_GL @@ -503,7 +503,7 @@ bool SampleWindow::onEvent(const SkEvent& evt) { static void cleanup_for_filename(SkString* name) { char* str = name->writable_str(); - for (int i = 0; i < name->size(); i++) { + for (size_t i = 0; i < name->size(); i++) { switch (str[i]) { case ':': str[i] = '-'; break; case '/': str[i] = '-'; break; @@ -741,7 +741,9 @@ void get_preferred_size(int* x, int* y, int* width, int* height) { void application_init() { // setenv("ANDROID_ROOT", "../../../data", 0); +#ifdef SK_BUILD_FOR_MAC setenv("ANDROID_ROOT", "/android/device/data", 0); +#endif SkGraphics::Init(); SkEvent::Init(); } -- cgit v1.2.3