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
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 2ac395c..d5a4b9d 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -28,7 +28,7 @@
'../src/opts',
],
'conditions': [
- [ 'skia_arch_type == "x86"', {
+ [ 'skia_arch_type == "x86" and skia_os != "ios"', {
'conditions': [
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'cflags': [
@@ -71,10 +71,16 @@
'dependencies': [
'opts_neon',
]
- }]
+ }],
+ [ 'skia_os == "ios"', {
+ 'sources!': [
+ # this needs to be rewritten to be xcode-friendly
+ '../src/opts/memset.arm.S',
+ ],
+ }],
],
}],
- [ 'skia_arch_type == "arm" and armv7 != 1', {
+ [ '(skia_arch_type == "arm" and armv7 == 0) or (skia_arch_type == "x86" and skia_os == "ios")', {
'sources': [
'../src/opts/SkBitmapProcState_opts_none.cpp',
'../src/opts/SkBlitRow_opts_none.cpp',