diff options
author | caryclark <caryclark@google.com> | 2014-07-11 12:14:51 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-07-11 12:14:51 -0700 |
commit | 936b73424f7393994be832376287da988a52b993 (patch) | |
tree | 593058a39c92a62ab13de099542884aa307f6848 /gyp | |
parent | bc9205be0a1094e312da098348601398c210dc5a (diff) |
ios fixes
skia_ios.mm
Get the app's Documents directory and pass use it to set the resource path.
This is a quick hack which will be replaced by a new application that is
a tiny shim around a command line tool.
SkImageEncoder.h
SkForceLinking.cpp
SkImageDecoder_CG.cpp
Add support for FORCE_LINKING so iOS sees the PNG encoder and others.
SkFloatBits.cpp
SkPoint.cpp
Handle denormalized numbers that are floored by the iOS ARM processor.
SkImageDecoder_iOS.mm
Remove empty encoder factory.
SkTouchGesture.cpp
Return early on empty state on touch rather than aborting (crashing)
JpegTest.cpp
Hal via stackoverflow.com says partial jpegs can be gray as well.
skia_test.cpp
Remove crash handler call for now to avoid link failure.
OverwriteLine.h
Remove fancy line overwrite for iOS.
Resources.cpp
Add interface to set resource directory based on runtime query.
BUG=skia:2736 skia:2737 skia:2738
R=reed@google.com, halcanary@google.com, mtklein@google.com, tfarina@chromium.org
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/373383003
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/iOSShell.gyp | 85 | ||||
-rw-r--r-- | gyp/most.gyp | 1 |
2 files changed, 86 insertions, 0 deletions
diff --git a/gyp/iOSShell.gyp b/gyp/iOSShell.gyp new file mode 100644 index 0000000000..ed648a38c4 --- /dev/null +++ b/gyp/iOSShell.gyp @@ -0,0 +1,85 @@ +# +{ + 'conditions' : [ + [ 'skia_os == "ios"', { + 'targets': [ + { + 'target_name': 'iOSShell', + 'type': 'executable', + 'mac_bundle' : 1, + 'includes': [ + 'tests.gypi', + 'pathops_unittest.gypi', + ], + 'dependencies': [ + 'tools.gyp:crash_handler', + 'views.gyp:views', + 'xml.gyp:xml', + ], + 'sources': [ + '../tests/skia_test.cpp', + '../tools/iOSShell.cpp', + '../src/views/mac/SkEventNotifier.mm', + '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', + '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', + '../experimental/iOSShell/iOSShell-Info.plist', + '../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm', + '../experimental/iOSSampleApp/Shared/SkUIView.mm', + '../experimental/iOSSampleApp/Shared/skia_ios.mm', + + # iPad + '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', + '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + + # iPhone + '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', + '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + + '../src/views/ios/SkOSWindow_iOS.mm', + '../src/utils/ios/SkStream_NSData.mm', + '../src/utils/mac/SkCreateCGImageRef.cpp', + ], + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', + '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', + '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', + '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', + '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework', + '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', + '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', + ], + }, + 'include_dirs' : [ + '../experimental/iOSSampleApp', + '../experimental/iOSSampleApp/iPad', + '../experimental/iOSSampleApp/iPhone', + '../experimental/iOSSampleApp/Shared', + '../include/utils/ios', + '../src/views/mac', + ], + 'xcode_settings' : { + 'INFOPLIST_FILE' : '../experimental/iOSShell/iOSShell-Info.plist', + }, + 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', + 'mac_bundle_resources' : [ + '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', + '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', + ], + 'conditions' : [ + [ 'skia_gpu == 1', { + 'dependencies': [ + 'gputest.gyp:skgputest', + ], + }], + ], + }, + ], + }], + ] +} diff --git a/gyp/most.gyp b/gyp/most.gyp index ba189316e9..4675add4dd 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -30,6 +30,7 @@ }], ['skia_os == "ios"', { 'dependencies!': [ 'SampleApp.gyp:SampleApp' ], + 'dependencies': ['iOSShell.gyp:iOSShell' ], }], ['skia_os == "mac" or skia_os == "linux"', { 'dependencies': [ 'nanomsg.gyp:*' ], |