diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-20 15:45:41 +0000 |
| commit | 867cbd8bc29371a360194aed648c4d43307b0639 (patch) | |
| tree | a8304af47996be63595ff3659546f82772230d6b /include/core/SkOSFile.h | |
| parent | db545aec7267b10f1cb925204862f7e16753b724 (diff) | |
first cut at making iOS work
Replace __arm__ with SK_CPU_ARM
add support for iOS simulator and device
fix const warning in iOSSampleApp
update gyp files
https://code.google.com/p/skia/issues/detail?id=900
tracks fixing missing arm assembly
Review URL: https://codereview.appspot.com/6552045
git-svn-id: http://skia.googlecode.com/svn/trunk@5606 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkOSFile.h')
| -rw-r--r-- | include/core/SkOSFile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkOSFile.h b/include/core/SkOSFile.h index 45d9d66270..b5477cd5cf 100644 --- a/include/core/SkOSFile.h +++ b/include/core/SkOSFile.h @@ -13,7 +13,7 @@ #include "SkString.h" -#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS) #include <dirent.h> #endif @@ -58,7 +58,7 @@ public: #ifdef SK_BUILD_FOR_WIN HANDLE fHandle; uint16_t* fPath16; -#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) +#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_IOS) DIR* fDIR; SkString fPath, fSuffix; #endif |