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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/tools.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/v8.gyp
diff --git a/gyp/v8.gyp b/gyp/v8.gyp
index b2eb54c2efb54992767021f856e05215a3b999fb..0316d34eb9e4a3a3509627d4c56a335bb27b8c6c 100644
--- a/gyp/v8.gyp
+++ b/gyp/v8.gyp
@@ -6,88 +6,83 @@
'type': 'executable',
'mac_bundle' : 1,
'include_dirs' : [
- '../tools/flags',
'../third_party/externals/v8/include',
- ],
- 'sources': [
- '../experimental/SkV8Example/SkV8Example.cpp',
- '../experimental/SkV8Example/SkV8Example.h',
- '../experimental/SkV8Example/Global.cpp',
- '../experimental/SkV8Example/Global.h',
- '../experimental/SkV8Example/Path2D.cpp',
- '../experimental/SkV8Example/Path2D.h',
- '../experimental/SkV8Example/BaseContext.cpp',
- '../experimental/SkV8Example/BaseContext.h',
- '../experimental/SkV8Example/JsContext.cpp',
- '../experimental/SkV8Example/JsContext.h',
- ],
- 'dependencies': [
- 'flags.gyp:flags',
- 'skia_lib.gyp:skia_lib',
- 'views.gyp:views',
- 'xml.gyp:xml',
- ],
- 'link_settings': {
- 'libraries': [
+ ],
+ 'sources': [
+ '../experimental/SkV8Example/BaseContext.cpp',
+ '../experimental/SkV8Example/BaseContext.h',
+ '../experimental/SkV8Example/Global.cpp',
+ '../experimental/SkV8Example/Global.h',
+ '../experimental/SkV8Example/JsContext.cpp',
+ '../experimental/SkV8Example/JsContext.h',
+ '../experimental/SkV8Example/Path2D.cpp',
+ '../experimental/SkV8Example/Path2D.h',
+ '../experimental/SkV8Example/SkV8Example.cpp',
+ '../experimental/SkV8Example/SkV8Example.h',
+ ],
+ 'dependencies': [
+ 'flags.gyp:flags',
+ 'skia_lib.gyp:skia_lib',
+ 'views.gyp:views',
+ 'xml.gyp:xml',
+ ],
+ 'link_settings': {
+ 'libraries': [
-# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
-# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
-# 'd:/src/v8/build/Debug/lib/icuuc.lib',
-# 'd:/src/v8/build/Debug/lib/icui18n.lib',
-# 'Ws2_32.lib',
-# 'Winmm.lib',
+# 'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
+# 'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
+# 'd:/src/v8/build/Debug/lib/icuuc.lib',
+# 'd:/src/v8/build/Debug/lib/icui18n.lib',
+# 'Ws2_32.lib',
+# 'Winmm.lib',
- '-lpthread',
- '-lrt',
- '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_base.x64.a',
- '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_snapshot.a',
- '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicudata.a',
- '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicui18n.a',
- '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicuuc.a',
- '../../third_party/externals/v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o',
- ],
- },
- 'conditions' : [
- [ 'skia_gpu == 1', {
- 'include_dirs' : [
- '../src/gpu', #gl/GrGLUtil.h
- ]
- }],
- [ 'skia_os == "win"', {
- 'sources' : [
- '../src/views/win/SkOSWindow_Win.cpp',
- '../src/views/win/skia_win.cpp',
- ],
- },
+ '-lpthread',
+ '-lrt',
+ '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_base.x64.a',
+ '../../third_party/externals/v8/out/native/obj.target/tools/gyp/libv8_snapshot.a',
+ '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicudata.a',
+ '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicui18n.a',
+ '../../third_party/externals/v8/out/native/obj.target/third_party/icu/libicuuc.a',
+ '../../third_party/externals/v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o',
],
-
+ },
+ 'conditions' : [
+ [ 'skia_gpu == 1', {
+ 'include_dirs' : [
+ '../src/gpu',
+ ]
+ }],
+ [ 'skia_os == "win"', {
+ 'sources' : [
+ '../src/views/win/SkOSWindow_Win.cpp',
+ '../src/views/win/skia_win.cpp',
+ ],
+ }],
[ 'skia_os == "mac"', {
'sources': [
-
- '../src/views/mac/SampleAppDelegate.h',
- '../src/views/mac/SampleAppDelegate.mm',
- '../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',
+ '../src/views/mac/SampleAppDelegate.h',
+ '../src/views/mac/SampleAppDelegate.mm',
+ '../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',
],
- 'include_dirs' : [
- '../src/views/mac/'
+ 'include_dirs' : [
+ '../src/views/mac/'
],
- 'xcode_settings' : {
- 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
- },
- 'mac_bundle_resources' : [
- '../experimental/SkiaExamples/SkiaExamples.xib'
+ 'xcode_settings' : {
+ 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
+ },
+ 'mac_bundle_resources' : [
+ '../experimental/SkiaExamples/SkiaExamples.xib'
],
- }
+ }],
],
- ],
}
],
}
« 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