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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: gyp/v8.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/tools.gyp ('k') | no next file » | 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 a V8 sample. 1 # GYP file to build a V8 sample.
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'SkV8Example', 5 'target_name': 'SkV8Example',
6 'type': 'executable', 6 'type': 'executable',
7 'mac_bundle' : 1, 7 'mac_bundle' : 1,
8 'include_dirs' : [ 8 'include_dirs' : [
9 '../tools/flags',
10 '../third_party/externals/v8/include', 9 '../third_party/externals/v8/include',
10 ],
11 'sources': [
12 '../experimental/SkV8Example/BaseContext.cpp',
13 '../experimental/SkV8Example/BaseContext.h',
14 '../experimental/SkV8Example/Global.cpp',
15 '../experimental/SkV8Example/Global.h',
16 '../experimental/SkV8Example/JsContext.cpp',
17 '../experimental/SkV8Example/JsContext.h',
18 '../experimental/SkV8Example/Path2D.cpp',
19 '../experimental/SkV8Example/Path2D.h',
20 '../experimental/SkV8Example/SkV8Example.cpp',
21 '../experimental/SkV8Example/SkV8Example.h',
22 ],
23 'dependencies': [
24 'flags.gyp:flags',
25 'skia_lib.gyp:skia_lib',
26 'views.gyp:views',
27 'xml.gyp:xml',
28 ],
29 'link_settings': {
30 'libraries': [
31
32 # 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
33 # 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
34 # 'd:/src/v8/build/Debug/lib/icuuc.lib',
35 # 'd:/src/v8/build/Debug/lib/icui18n.lib',
36 # 'Ws2_32.lib',
37 # 'Winmm.lib',
38
39 '-lpthread',
40 '-lrt',
41 '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_ base.x64.a',
42 '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_ snapshot.a',
43 '../../third_party/externals/v8/out/native/obj.target/third_party/icu/ libicudata.a',
44 '../../third_party/externals/v8/out/native/obj.target/third_party/icu/ libicui18n.a',
45 '../../third_party/externals/v8/out/native/obj.target/third_party/icu/ libicuuc.a',
46 '../../third_party/externals/v8/out/native/obj.target/icudata/third_pa rty/icu/linux/icudt46l_dat.o',
11 ], 47 ],
12 'sources': [ 48 },
13 '../experimental/SkV8Example/SkV8Example.cpp', 49 'conditions' : [
14 '../experimental/SkV8Example/SkV8Example.h', 50 [ 'skia_gpu == 1', {
15 '../experimental/SkV8Example/Global.cpp', 51 'include_dirs' : [
16 '../experimental/SkV8Example/Global.h', 52 '../src/gpu',
17 '../experimental/SkV8Example/Path2D.cpp', 53 ]
18 '../experimental/SkV8Example/Path2D.h', 54 }],
19 '../experimental/SkV8Example/BaseContext.cpp',
20 '../experimental/SkV8Example/BaseContext.h',
21 '../experimental/SkV8Example/JsContext.cpp',
22 '../experimental/SkV8Example/JsContext.h',
23 ],
24 'dependencies': [
25 'flags.gyp:flags',
26 'skia_lib.gyp:skia_lib',
27 'views.gyp:views',
28 'xml.gyp:xml',
29 ],
30 'link_settings': {
31 'libraries': [
32
33 # 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
34 # 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
35 # 'd:/src/v8/build/Debug/lib/icuuc.lib',
36 # 'd:/src/v8/build/Debug/lib/icui18n.lib',
37 # 'Ws2_32.lib',
38 # 'Winmm.lib',
39
40 '-lpthread',
41 '-lrt',
42 '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8 _base.x64.a',
43 '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8 _snapshot.a',
44 '../../third_party/externals/v8/out/native/obj.target/third_party/icu /libicudata.a',
45 '../../third_party/externals/v8/out/native/obj.target/third_party/icu /libicui18n.a',
46 '../../third_party/externals/v8/out/native/obj.target/third_party/icu /libicuuc.a',
47 '../../third_party/externals/v8/out/native/obj.target/icudata/third_p arty/icu/linux/icudt46l_dat.o',
48 ],
49 },
50 'conditions' : [
51 [ 'skia_gpu == 1', {
52 'include_dirs' : [
53 '../src/gpu', #gl/GrGLUtil.h
54 ]
55 }],
56 [ 'skia_os == "win"', { 55 [ 'skia_os == "win"', {
57 'sources' : [ 56 'sources' : [
58 '../src/views/win/SkOSWindow_Win.cpp', 57 '../src/views/win/SkOSWindow_Win.cpp',
59 '../src/views/win/skia_win.cpp', 58 '../src/views/win/skia_win.cpp',
60 ], 59 ],
61 }, 60 }],
62 ],
63
64 [ 'skia_os == "mac"', { 61 [ 'skia_os == "mac"', {
65 'sources': [ 62 'sources': [
66 63 '../src/views/mac/SampleAppDelegate.h',
67 '../src/views/mac/SampleAppDelegate.h', 64 '../src/views/mac/SampleAppDelegate.mm',
68 '../src/views/mac/SampleAppDelegate.mm', 65 '../src/views/mac/SkEventNotifier.mm',
69 '../src/views/mac/SkEventNotifier.mm', 66 '../src/views/mac/skia_mac.mm',
70 '../src/views/mac/skia_mac.mm', 67 '../src/views/mac/SkNSView.h',
71 '../src/views/mac/SkNSView.h', 68 '../src/views/mac/SkNSView.mm',
72 '../src/views/mac/SkNSView.mm', 69 '../src/views/mac/SkOptionsTableView.h',
73 '../src/views/mac/SkOptionsTableView.h', 70 '../src/views/mac/SkOptionsTableView.mm',
74 '../src/views/mac/SkOptionsTableView.mm', 71 '../src/views/mac/SkOSWindow_Mac.mm',
75 '../src/views/mac/SkOSWindow_Mac.mm', 72 '../src/views/mac/SkTextFieldCell.h',
76 '../src/views/mac/SkTextFieldCell.h', 73 '../src/views/mac/SkTextFieldCell.m',
77 '../src/views/mac/SkTextFieldCell.m',
78 ], 74 ],
79 'include_dirs' : [ 75 'include_dirs' : [
80 '../src/views/mac/' 76 '../src/views/mac/'
81 ], 77 ],
82 'xcode_settings' : { 78 'xcode_settings' : {
83 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.pli st', 79 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.p list',
84 }, 80 },
85 'mac_bundle_resources' : [ 81 'mac_bundle_resources' : [
86 '../experimental/SkiaExamples/SkiaExamples.xib' 82 '../experimental/SkiaExamples/SkiaExamples.xib'
87 ], 83 ],
88 } 84 }],
89 ], 85 ],
90 ],
91 } 86 }
92 ], 87 ],
93 } 88 }
OLDNEW
« no previous file with comments | « gyp/tools.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698