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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gyp/experimental.gyp

Issue 343283002: No need to include ../tools/flags in include_dirs when depending on flags target. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase 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
« no previous file with comments | « gyp/everything.gyp ('k') | gyp/flags.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 # GYP file to build experimental directory. 1 # GYP file to build experimental directory.
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'experimental', 5 'target_name': 'experimental',
6 'type': 'static_library', 6 'type': 'static_library',
7 'include_dirs': [ 7 'include_dirs': [
8 '../include/config', 8 '../include/config',
9 '../include/core', 9 '../include/core',
10 ], 10 ],
11 'sources': [ 11 'sources': [
12 '../experimental/SkSetPoly3To3.cpp', 12 '../experimental/SkSetPoly3To3.cpp',
13 '../experimental/SkSetPoly3To3_A.cpp', 13 '../experimental/SkSetPoly3To3_A.cpp',
14 '../experimental/SkSetPoly3To3_D.cpp', 14 '../experimental/SkSetPoly3To3_D.cpp',
15 ], 15 ],
16 'direct_dependent_settings': { 16 'direct_dependent_settings': {
17 'include_dirs': [ 17 'include_dirs': [
18 '../experimental', 18 '../experimental',
19 ], 19 ],
20 }, 20 },
21 }, 21 },
22 { 22 {
23 'target_name': 'SkiaExamples', 23 'target_name': 'SkiaExamples',
24 'type': 'executable', 24 'type': 'executable',
25 'mac_bundle' : 1, 25 'mac_bundle' : 1,
26 'include_dirs' : [ 26 'sources': [
27 '../tools/flags', 27 '../experimental/SkiaExamples/SkExample.h',
28 ], 28 '../experimental/SkiaExamples/SkExample.cpp',
29 'includes': [], 29 '../experimental/SkiaExamples/HelloSkiaExample.cpp',
30 'sources': [ 30 ],
31 '../experimental/SkiaExamples/SkExample.h', 31 'dependencies': [
32 '../experimental/SkiaExamples/SkExample.cpp', 32 'flags.gyp:flags',
33 '../experimental/SkiaExamples/HelloSkiaExample.cpp', 33 'skia_lib.gyp:skia_lib',
34 ], 34 'views.gyp:views',
35 'dependencies': [ 35 'xml.gyp:xml',
36 'skia_lib.gyp:skia_lib', 36 ],
37 'views.gyp:views', 37 'conditions' : [
38 'xml.gyp:xml', 38 [ 'skia_gpu == 1', {
39 'flags.gyp:flags' 39 'include_dirs' : [
40 ], 40 '../src/gpu',
41 'conditions' : [ 41 ],
42 [ 'skia_gpu == 1', { 42 }],
43 'include_dirs' : [
44 '../src/gpu', #gl/GrGLUtil.h
45 ]
46 }],
47 [ 'skia_os == "win"', { 43 [ 'skia_os == "win"', {
48 'sources' : [ 44 'sources' : [
49 '../src/views/win/SkOSWindow_Win.cpp', 45 '../src/views/win/SkOSWindow_Win.cpp',
50 '../src/views/win/skia_win.cpp', 46 '../src/views/win/skia_win.cpp',
51 ], 47 ],
52 }, 48 }],
53 ],
54
55 [ 'skia_os == "mac"', { 49 [ 'skia_os == "mac"', {
56 'sources': [ 50 'sources': [
57 51 '../experimental/SkiaExamples/SkiaExamples-Info.plist',
58 # SkiaExamples specific files 52 '../experimental/SkiaExamples/SkExampleNSView.h',
59 '../experimental/SkiaExamples/SkiaExamples-Info.plist', 53 '../experimental/SkiaExamples/SkExampleNSView.mm',
60 '../experimental/SkiaExamples/SkExampleNSView.h', 54 '../src/views/mac/SampleAppDelegate.h',
61 '../experimental/SkiaExamples/SkExampleNSView.mm', 55 '../src/views/mac/SampleAppDelegate.mm',
62 56 '../src/views/mac/SkEventNotifier.mm',
63 # Mac files 57 '../src/views/mac/skia_mac.mm',
64 '../src/views/mac/SampleAppDelegate.h', 58 '../src/views/mac/SkNSView.h',
65 '../src/views/mac/SampleAppDelegate.mm', 59 '../src/views/mac/SkNSView.mm',
66 '../src/views/mac/SkEventNotifier.mm', 60 '../src/views/mac/SkOptionsTableView.h',
67 '../src/views/mac/skia_mac.mm', 61 '../src/views/mac/SkOptionsTableView.mm',
68 '../src/views/mac/SkNSView.h', 62 '../src/views/mac/SkOSWindow_Mac.mm',
69 '../src/views/mac/SkNSView.mm', 63 '../src/views/mac/SkTextFieldCell.h',
70 '../src/views/mac/SkOptionsTableView.h', 64 '../src/views/mac/SkTextFieldCell.m',
71 '../src/views/mac/SkOptionsTableView.mm',
72 '../src/views/mac/SkOSWindow_Mac.mm',
73 '../src/views/mac/SkTextFieldCell.h',
74 '../src/views/mac/SkTextFieldCell.m',
75 ], 65 ],
76 'include_dirs' : [ 66 'include_dirs' : [
77 '../src/views/mac/' 67 '../src/views/mac/'
78 ], 68 ],
79 'link_settings': { 69 'xcode_settings' : {
80 }, 70 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.p list',
81 'xcode_settings' : { 71 },
82 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.pli st', 72 'mac_bundle_resources' : [
83 }, 73 '../experimental/SkiaExamples/SkiaExamples.xib'
84 'mac_bundle_resources' : [
85 '../experimental/SkiaExamples/SkiaExamples.xib'
86 ], 74 ],
87 } 75 }],
88 ], 76 ],
89 ],
90 } 77 }
91 ], 78 ],
92 } 79 }
OLDNEW
« no previous file with comments | « gyp/everything.gyp ('k') | gyp/flags.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698