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

Unified Diff: gyp/example.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 | « gyp/SimpleCocoaApp.gyp ('k') | gyp/v8.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/example.gyp
diff --git a/gyp/example.gyp b/gyp/example.gyp
index 9582b4dd7403e64c88fb2286cde025e2f1beecec..a01717e67e6f121ad6dd9222bb8db017394dfbe4 100644
--- a/gyp/example.gyp
+++ b/gyp/example.gyp
@@ -4,11 +4,13 @@
# found in the LICENSE file.
# GYP file to build hello world example.
{
+ 'includes': [
+ 'apptype_console.gypi',
+ ],
'targets': [
{
'target_name': 'HelloWorld',
'type': 'executable',
- 'mac_bundle' : 1,
'include_dirs' : [
'../include/gpu',
],
@@ -20,36 +22,6 @@
'skia_lib.gyp:skia_lib',
'views.gyp:views',
],
- 'conditions' : [
- [ 'skia_os == "win"', {
- 'sources' : [
- '../src/views/win/SkOSWindow_Win.cpp',
- '../src/views/win/skia_win.cpp',
- ],
- }],
- [ 'skia_os == "mac"', {
- 'sources': [
- '../example/mac/HelloWorldNSView.mm',
- '../example/mac/HelloWorldDelegate.mm',
-
- '../src/views/mac/SkEventNotifier.mm',
- '../src/views/mac/skia_mac.mm',
- '../src/views/mac/SkNSView.mm',
- '../src/views/mac/SkOptionsTableView.mm',
- '../src/views/mac/SkOSWindow_Mac.mm',
- '../src/views/mac/SkTextFieldCell.m',
- ],
- 'include_dirs' : [
- '../src/views/mac/'
- ],
- 'xcode_settings' : {
- 'INFOPLIST_FILE' : '../example/mac/HelloWorld-Info.plist',
- },
- 'mac_bundle_resources' : [
- '../example/mac/HelloWorld.xib'
- ],
- }],
- ],
},
],
}
« no previous file with comments | « gyp/SimpleCocoaApp.gyp ('k') | gyp/v8.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698