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

Unified Diff: gyp/SampleApp.gyp

Issue 1184143011: nibless mac, visual bench working on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix HelloWorld compile on windows Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gyp/SimpleCocoaApp.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/SampleApp.gyp
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index fbec0edf41b1bd0a7a28c607238fb6259e903c3c..3a96e2b92cc9c69393c1c018e5e19952cc640008 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -15,7 +15,6 @@
{
'target_name': 'SampleApp',
'type': 'executable',
- 'mac_bundle' : 1,
'include_dirs' : [
'../src/core',
'../src/effects', #needed for BlurMask.h
@@ -181,38 +180,6 @@
'../samplecode/SampleEncode.cpp',
],
}],
- [ 'skia_os == "mac"', {
- 'sources': [
- # Sample App specific files
- '../src/views/mac/SampleApp-Info.plist',
- '../src/views/mac/SampleAppDelegate.h',
- '../src/views/mac/SampleAppDelegate.mm',
- '../src/views/mac/SkSampleNSView.h',
- '../src/views/mac/SkSampleNSView.mm',
-
- # Mac files
- '../src/views/mac/SkEventNotifier.h',
- '../src/views/mac/SkEventNotifier.mm',
- '../src/views/mac/skia_mac.mm',
- '../src/views/mac/SkNSView.h',
- '../src/views/mac/SkNSView.mm',
- '../src/views/mac/SkOptionsTableView.h',
- '../src/views/mac/SkOptionsTableView.mm',
- '../src/views/mac/SkOSWindow_Mac.mm',
- '../src/views/mac/SkTextFieldCell.h',
- '../src/views/mac/SkTextFieldCell.m',
- ],
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
- '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
- ],
- 'xcode_settings' : {
- 'INFOPLIST_FILE' : '../src/views/mac/SampleApp-Info.plist',
- },
- 'mac_bundle_resources' : [
- '../src/views/mac/SampleApp.xib',
- ],
- }],
[ 'skia_os == "ios"', {
# TODO: This doesn't build properly yet, but it's getting there.
'sources!': [
« no previous file with comments | « no previous file | gyp/SimpleCocoaApp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698