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/opts | |
| 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/opts')
| -rw-r--r-- | src/opts/opts_check_arm.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opts/opts_check_arm.cpp b/src/opts/opts_check_arm.cpp index cd0f626993..69cedb269a 100644 --- a/src/opts/opts_check_arm.cpp +++ b/src/opts/opts_check_arm.cpp @@ -29,7 +29,8 @@ extern "C" void arm_memset32(uint32_t* dst, uint32_t value, int count); #endif SkMemset16Proc SkMemset16GetPlatformProc() { -#if !defined(SK_CPU_LENDIAN) + // FIXME: memset.arm.S is using syntax incompatible with XCode +#if !defined(SK_CPU_LENDIAN) || defined(SK_BUILD_FOR_IOS) return NULL; #elif SK_ARM_NEON_IS_DYNAMIC if (sk_cpu_arm_has_neon()) { @@ -45,7 +46,8 @@ SkMemset16Proc SkMemset16GetPlatformProc() { } SkMemset32Proc SkMemset32GetPlatformProc() { -#if !defined(SK_CPU_LENDIAN) + // FIXME: memset.arm.S is using syntax incompatible with XCode +#if !defined(SK_CPU_LENDIAN) || defined(SK_BUILD_FOR_IOS) return NULL; #elif SK_ARM_NEON_IS_DYNAMIC if (sk_cpu_arm_has_neon()) { |