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 /src/core | |
| 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 'src/core')
| -rw-r--r-- | src/core/SkUtilsArm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkUtilsArm.h b/src/core/SkUtilsArm.h index 6a5aab8067..9ae648a437 100644 --- a/src/core/SkUtilsArm.h +++ b/src/core/SkUtilsArm.h @@ -21,9 +21,9 @@ #define SK_ARM_NEON_MODE_ALWAYS 1 #define SK_ARM_NEON_MODE_DYNAMIC 2 -#if defined(__arm__) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) +#if defined(SK_CPU_ARM) && defined(__ARM_HAVE_OPTIONAL_NEON_SUPPORT) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_DYNAMIC -#elif defined(__arm__) && defined(__ARM_HAVE_NEON) +#elif defined(SK_CPU_ARM) && defined(__ARM_HAVE_NEON) # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_ALWAYS #else # define SK_ARM_NEON_MODE SK_ARM_NEON_MODE_NONE |