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

Side by Side Diff: gyp/SampleApp.gyp

Issue 226413005: get iOS building again (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: just cast Created 6 years, 8 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
« no previous file with comments | « no previous file | gyp/SimpleiOSApp.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 'mac_bundle_resources' : [ 201 'mac_bundle_resources' : [
202 '../src/views/mac/SampleApp.xib', 202 '../src/views/mac/SampleApp.xib',
203 ], 203 ],
204 }], 204 }],
205 [ 'skia_os == "ios"', { 205 [ 'skia_os == "ios"', {
206 # TODO: This doesn't build properly yet, but it's getting there. 206 # TODO: This doesn't build properly yet, but it's getting there.
207 'sources!': [ 207 'sources!': [
208 '../samplecode/SampleDecode.cpp', 208 '../samplecode/SampleDecode.cpp',
209 ], 209 ],
210 'sources': [ 210 'sources': [
211 '../src/views/mac/SkEventNotifier.h',
212 '../src/views/mac/SkEventNotifier.mm', 211 '../src/views/mac/SkEventNotifier.mm',
213 '../experimental/iOSSampleApp/SkSampleUIView.h',
214 '../experimental/iOSSampleApp/SkSampleUIView.mm', 212 '../experimental/iOSSampleApp/SkSampleUIView.mm',
215 '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig', 213 '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
216 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', 214 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
217 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', 215 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
218 '../experimental/iOSSampleApp/iOSSampleApp-Info.plist', 216 '../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
219 '../experimental/iOSSampleApp/Shared/SkOptionListController.h',
220 '../experimental/iOSSampleApp/Shared/SkOptionListController.mm', 217 '../experimental/iOSSampleApp/Shared/SkOptionListController.mm',
221 '../experimental/iOSSampleApp/Shared/SkUIRootViewController.h',
222 '../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm', 218 '../experimental/iOSSampleApp/Shared/SkUIRootViewController.mm',
223 '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.h' ,
224 '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.mm ', 219 '../experimental/iOSSampleApp/Shared/SkOptionsTableViewController.mm ',
225 '../experimental/iOSSampleApp/Shared/SkUIView.h',
226 '../experimental/iOSSampleApp/Shared/SkUIView.mm', 220 '../experimental/iOSSampleApp/Shared/SkUIView.mm',
227 '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h',
228 '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm', 221 '../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm',
229 '../experimental/iOSSampleApp/Shared/skia_ios.mm', 222 '../experimental/iOSSampleApp/Shared/skia_ios.mm',
230 223
231 # iPad 224 # iPad
232 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
233 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm', 225 '../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
234 '../experimental/iOSSampleApp/iPad/SkUISplitViewController.h',
235 '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm', 226 '../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm',
236 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', 227 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
237 228
238 # iPhone 229 # iPhone
239 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
240 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm', 230 '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
241 '../experimental/iOSSampleApp/iPhone/SkUINavigationController.h',
242 '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm', 231 '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
243 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', 232 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
244 233
245 '../src/views/ios/SkOSWindow_iOS.mm', 234 '../src/views/ios/SkOSWindow_iOS.mm',
246 '../src/utils/ios/SkImageDecoder_iOS.mm', 235 '../src/utils/ios/SkImageDecoder_iOS.mm',
247 '../src/utils/ios/SkStream_NSData.mm', 236 '../src/utils/ios/SkStream_NSData.mm',
248 '../src/utils/ios/SkOSFile_iOS.mm', 237 '../src/utils/ios/SkOSFile_iOS.mm',
249 238
250 '../include/utils/mac/SkCGUtils.h',
251 '../src/utils/mac/SkCreateCGImageRef.cpp', 239 '../src/utils/mac/SkCreateCGImageRef.cpp',
252 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig', 240 '../experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig',
253 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig', 241 '../experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig',
254 ], 242 ],
255 'link_settings': { 243 'link_settings': {
256 'libraries': [ 244 'libraries': [
257 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 245 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
258 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 246 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
259 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework', 247 '$(SDKROOT)/System/Library/Frameworks/CoreText.framework',
260 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', 248 '$(SDKROOT)/System/Library/Frameworks/UIKit.framework',
261 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 249 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
262 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 250 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
263 '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework', 251 '$(SDKROOT)/System/Library/Frameworks/OpenGLES.framework',
264 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework', 252 '$(SDKROOT)/System/Library/Frameworks/ImageIO.framework',
265 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ', 253 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ',
266 ], 254 ],
267 }, 255 },
268 'include_dirs' : [ 256 'include_dirs' : [
269 '../experimental/iOSSampleApp', 257 '../experimental/iOSSampleApp',
270 '../experimental/iOSSampleApp/iPad', 258 '../experimental/iOSSampleApp/iPad',
271 '../experimental/iOSSampleApp/iPhone', 259 '../experimental/iOSSampleApp/iPhone',
260 '../experimental/iOSSampleApp/Shared',
272 '../include/utils/ios', 261 '../include/utils/ios',
262 '../src/views/mac',
273 ], 263 ],
274 'xcode_settings' : { 264 'xcode_settings' : {
275 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.p list', 265 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.p list',
276 }, 266 },
277 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base .xcconfig', 267 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base .xcconfig',
278 'mac_bundle_resources' : [ 268 'mac_bundle_resources' : [
279 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', 269 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
280 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', 270 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
281 ], 271 ],
282 }], 272 }],
(...skipping 22 matching lines...) Expand all
305 }], 295 }],
306 ], 296 ],
307 'msvs_settings': { 297 'msvs_settings': {
308 'VCLinkerTool': { 298 'VCLinkerTool': {
309 'SubSystem': '2', 299 'SubSystem': '2',
310 }, 300 },
311 }, 301 },
312 }, 302 },
313 ], 303 ],
314 } 304 }
OLDNEW
« no previous file with comments | « no previous file | gyp/SimpleiOSApp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698