Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: gyp/SampleApp.gyp

Issue 322403007: Fix a number of issues with iOS build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove SKOSFile_iOS.mm a little more cleanly (and clearly) Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # 1 #
2 { 2 {
3 'variables': { 3 'variables': {
4 #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp 4 #manually set sample_pdf_file_viewer to 1 to have the PdfViewer in SampleApp
5 'sample_pdf_file_viewer%': 0, 5 'sample_pdf_file_viewer%': 0,
6 }, 6 },
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'SampleApp', 9 'target_name': 'SampleApp',
10 'type': 'executable', 10 'type': 'executable',
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', 229 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
230 230
231 # iPhone 231 # iPhone
232 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', 232 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
233 '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', 233 '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
234 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', 234 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
235 235
236 '../src/views/ios/SkOSWindow_iOS.mm', 236 '../src/views/ios/SkOSWindow_iOS.mm',
237 '../src/utils/ios/SkImageDecoder_iOS.mm', 237 '../src/utils/ios/SkImageDecoder_iOS.mm',
238 '../src/utils/ios/SkStream_NSData.mm', 238 '../src/utils/ios/SkStream_NSData.mm',
239 '../src/utils/ios/SkOSFile_iOS.mm', 239 # Not fully implemented yet
240 # '../src/utils/ios/SkOSFile_iOS.mm',
240 241
241 '../src/utils/mac/SkCreateCGImageRef.cpp', 242 '../src/utils/mac/SkCreateCGImageRef.cpp',
242 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', 243 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
243 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', 244 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
244 ], 245 ],
245 'link_settings': { 246 'link_settings': {
246 'libraries': [ 247 'libraries': [
247 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 248 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
248 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 249 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
249 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 250 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 }], 297 }],
297 ], 298 ],
298 'msvs_settings': { 299 'msvs_settings': {
299 'VCLinkerTool': { 300 'VCLinkerTool': {
300 'SubSystem': '2', 301 'SubSystem': '2',
301 }, 302 },
302 }, 303 },
303 }, 304 },
304 ], 305 ],
305 } 306 }
OLDNEW
« no previous file with comments | « experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm ('k') | src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698