get iOS building again
1) Disable SampleApp. Seems like it's totally horked? SkOSFile_iOS.mm is missing about half the functions needed, and SkOSFile_stdio.cpp is double-providing the others.
2) Drop armv6.
3) Switch from putting headers in sources to putting the corresponding directories in includes.
4) Force cast the type of glShaderSource. Something to do with GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE?
After all this,
env CC=clang CXX=clang++ GYP_DEFINES=skia_os=ios make
builds for me.
BUG=skia:2363
R=bsalomon@google.com, epoger@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/226413005
git-svn-id: http://skia.googlecode.com/svn/trunk@14069 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index a06082e..edcba10 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -208,37 +208,26 @@
'../samplecode/SampleDecode.cpp',
],
'sources': [
- '../src/views/mac/SkEventNotifier.h',
'../src/views/mac/SkEventNotifier.mm',
- '../experimental/iOSSampleApp/SkSampleUIView.h',
'../experimental/iOSSampleApp/SkSampleUIView.mm',
'../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
'../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
'../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
'../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
- '../experimental/iOSSampleApp/Shared/SkOptionListController.h',
'../experimental/iOSSampleApp/Shared/SkOptionListController.mm',
- '../experimental/iOSSampleApp/Shared/SkUIRootViewController.h',
'../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm',
- '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h',
'../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.mm',
- '../experimental/iOSSampleApp/Shared/SkUIView.h',
'../experimental/iOSSampleApp/Shared/SkUIView.mm',
- '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h',
'../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm',
'../experimental/iOSSampleApp/Shared/skia_ios.mm',
# iPad
- '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
'../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
- '../experimental/iOSSampleApp/iPad/SkUISplitViewController.h',
'../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm',
'../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
# iPhone
- '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
'../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
- '../experimental/iOSSampleApp/iPhone/SkUINavigationController.h',
'../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
'../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
@@ -247,7 +236,6 @@
'../src/utils/ios/SkStream_NSData.mm',
'../src/utils/ios/SkOSFile_iOS.mm',
- '../include/utils/mac/SkCGUtils.h',
'../src/utils/mac/SkCreateCGImageRef.cpp',
'../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
'../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
@@ -269,7 +257,9 @@
'../experimental/iOSSampleApp',
'../experimental/iOSSampleApp/iPad',
'../experimental/iOSSampleApp/iPhone',
+ '../experimental/iOSSampleApp/Shared',
'../include/utils/ios',
+ '../src/views/mac',
],
'xcode_settings' : {
'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
diff --git a/gyp/SimpleiOSApp.gyp b/gyp/SimpleiOSApp.gyp
index a44c8d1..bb5fc8f 100644
--- a/gyp/SimpleiOSApp.gyp
+++ b/gyp/SimpleiOSApp.gyp
@@ -11,19 +11,15 @@
'mac_bundle' : 1,
'include_dirs' : [
'../experimental/iOSSampleApp/Shared',
+ '../src/views/mac',
],
'sources': [
'../src/views/ios/SkOSWindow_iOS.mm',
- '../src/views/mac/SkEventNotifier.h',
'../src/views/mac/SkEventNotifier.mm',
- '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
'../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
- '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
'../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
- '../experimental/iOSSampleApp/Shared/SkUIView.h',
'../experimental/iOSSampleApp/Shared/SkUIView.mm',
'../experimental/iOSSampleApp/Shared/skia_ios.mm',
- '../experimental/SimpleiOSApp/SimpleApp.h',
'../experimental/SimpleiOSApp/SimpleApp.mm',
'../experimental/SimpleiOSApp/SimpleiOSApp-Info.plist',
],
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index b9c1ff6..85cc502 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -34,19 +34,15 @@
'../include/views',
'../include/xml',
'../include/utils/mac',
+ '../src/views/mac',
],
'sources': [
'../src/views/ios/SkOSWindow_iOS.mm',
- '../src/views/mac/SkEventNotifier.h',
'../src/views/mac/SkEventNotifier.mm',
- '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
'../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
- '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
'../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
- '../experimental/iOSSampleApp/Shared/SkUIView.h',
'../experimental/iOSSampleApp/Shared/SkUIView.mm',
'../experimental/iOSSampleApp/Shared/skia_ios.mm',
- '../experimental/SimpleiOSApp/SimpleApp.h',
'../experimental/SimpleiOSApp/SimpleApp.mm',
],
'dependencies': [
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 93788a1..3743b60 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -533,7 +533,7 @@
},
},
'xcode_settings': {
- 'ARCHS': ['armv6', 'armv7'],
+ 'ARCHS': ['armv7'],
'CODE_SIGNING_REQUIRED': 'NO',
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
diff --git a/gyp/most.gyp b/gyp/most.gyp
index 3d9bad4..b805eec 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -29,6 +29,9 @@
['skia_os == "android"', {
'dependencies': [ 'android_system.gyp:SampleApp_APK' ],
}],
+ ['skia_os == "ios"', {
+ 'dependencies!': [ 'SampleApp.gyp:SampleApp' ],
+ }],
[ 'skia_skip_gui',
{
'dependencies!': [