diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-02 18:33:14 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-02 18:33:14 +0000 |
| commit | 5987f58036574ccf23049b5fe71f29a441d0641d (patch) | |
| tree | 2f3078337c92b9387c9d36f7ed3de82eacc3d085 /gyp | |
| parent | 425a8c71e43841bf6e8622bf7f6a7985a2efe4c7 (diff) | |
build iOS with 'make all'
This builds all skia tests by treating iOS tools
as executable applications. A few warnings were
fixed as well.
Removed old trace draw code and remnants.
Review URL: https://codereview.appspot.com/6597063
git-svn-id: http://skia.googlecode.com/svn/trunk@5776 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/apptype_console.gypi | 49 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 8 |
2 files changed, 51 insertions, 6 deletions
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index 229db0d95e..9e280617ad 100644 --- a/gyp/apptype_console.gypi +++ b/gyp/apptype_console.gypi @@ -17,6 +17,55 @@ 'android_deps.gyp:Android_EntryPoint', ], }], + ['skia_os == "ios"', { + 'target_conditions': [ + ['_type == "executable"', { + 'mac_bundle' : 1, + }], + ], + 'include_dirs' : [ + '../experimental/iOSSampleApp/Shared', + '../include/views', + '../include/xml', + '../include/utils/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': [ + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'link_settings': { + 'libraries': [ + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreGraphics.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/CoreText.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/Foundation.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/ImageIO.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/MobileCoreServices.framework', + '<(ios_sdk_dir)<(ios_sdk_version).sdk/System/Library/Frameworks/UIKit.framework', + ], + }, + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib', + '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist', + }, + }], ], }, } diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index b59bd11779..6a0fc6bd98 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -69,11 +69,6 @@ }, { 'skia_static_initializers%': 1, }], - [ 'skia_arch_type == "x86"', { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', - }, { - 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', - }], ], 'skia_scalar%': 'float', @@ -84,7 +79,8 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, - 'ios_sdk_version%': '5.1', + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + 'ios_sdk_version%': '6.0', 'skia_osx_sdkroot%': 'macosx10.6', }, |