AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

No need to include ../tools/flags in include_dirs when depending on flags target.

Browse Source 
"flags" target does it by direct_dependent_settings which exports the
include_dirs to targets that depend on it.

Along the way fixed the indentation of experimental.gyp and v8.gyp.

BUG=None
TEST=make all
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/343283002
This commit is contained in:
tfarina 2014-06-22 16:13:00 -07:00 committed by Commit bot
parent 830f356135
commit 1c4d5784f9
6 changed files with 117 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/everything.gyp
View File

@ -24,7 +24,7 @@
'pdfviewer.gyp:pdfviewer', 'pdfviewer.gyp:pdfviewer',
#'v8.gyp:SkV8Example', #'v8.gyp:SkV8Example',
#'webtry.gyp:webtry', #'webtry.gyp:webtry',
], ],
}], }],
], ],
}, },

101
gyp/experimental.gyp
View File

@ -23,70 +23,57 @@
'target_name': 'SkiaExamples', 'target_name': 'SkiaExamples',
'type': 'executable', 'type': 'executable',
'mac_bundle' : 1, 'mac_bundle' : 1,
'include_dirs' : [ 'sources': [
'../tools/flags', '../experimental/SkiaExamples/SkExample.h',
], '../experimental/SkiaExamples/SkExample.cpp',
'includes': [], '../experimental/SkiaExamples/HelloSkiaExample.cpp',
'sources': [ ],
'../experimental/SkiaExamples/SkExample.h', 'dependencies': [
'../experimental/SkiaExamples/SkExample.cpp', 'flags.gyp:flags',
'../experimental/SkiaExamples/HelloSkiaExample.cpp', 'skia_lib.gyp:skia_lib',
], 'views.gyp:views',
'dependencies': [ 'xml.gyp:xml',
'skia_lib.gyp:skia_lib', ],
'views.gyp:views', 'conditions' : [
'xml.gyp:xml', [ 'skia_gpu == 1', {
'flags.gyp:flags' 'include_dirs' : [
], '../src/gpu',
'conditions' : [ ],
[ 'skia_gpu == 1', { }],
'include_dirs' : [
'../src/gpu', #gl/GrGLUtil.h
]
}],
[ 'skia_os == "win"', { [ 'skia_os == "win"', {
'sources' : [ 'sources' : [
'../src/views/win/SkOSWindow_Win.cpp', '../src/views/win/SkOSWindow_Win.cpp',
'../src/views/win/skia_win.cpp', '../src/views/win/skia_win.cpp',
], ],
}, }],
],
[ 'skia_os == "mac"', { [ 'skia_os == "mac"', {
'sources': [ 'sources': [
'../experimental/SkiaExamples/SkiaExamples-Info.plist',
# SkiaExamples specific files '../experimental/SkiaExamples/SkExampleNSView.h',
'../experimental/SkiaExamples/SkiaExamples-Info.plist', '../experimental/SkiaExamples/SkExampleNSView.mm',
'../experimental/SkiaExamples/SkExampleNSView.h', '../src/views/mac/SampleAppDelegate.h',
'../experimental/SkiaExamples/SkExampleNSView.mm', '../src/views/mac/SampleAppDelegate.mm',
'../src/views/mac/SkEventNotifier.mm',
# Mac files '../src/views/mac/skia_mac.mm',
'../src/views/mac/SampleAppDelegate.h', '../src/views/mac/SkNSView.h',
'../src/views/mac/SampleAppDelegate.mm', '../src/views/mac/SkNSView.mm',
'../src/views/mac/SkEventNotifier.mm', '../src/views/mac/SkOptionsTableView.h',
'../src/views/mac/skia_mac.mm', '../src/views/mac/SkOptionsTableView.mm',
'../src/views/mac/SkNSView.h', '../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/SkNSView.mm', '../src/views/mac/SkTextFieldCell.h',
'../src/views/mac/SkOptionsTableView.h', '../src/views/mac/SkTextFieldCell.m',
'../src/views/mac/SkOptionsTableView.mm',
'../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/SkTextFieldCell.h',
'../src/views/mac/SkTextFieldCell.m',
], ],
'include_dirs' : [ 'include_dirs' : [
'../src/views/mac/' '../src/views/mac/'
], ],
'link_settings': { 'xcode_settings' : {
}, 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
'xcode_settings' : { },
'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', 'mac_bundle_resources' : [
}, '../experimental/SkiaExamples/SkiaExamples.xib'
'mac_bundle_resources' : [
'../experimental/SkiaExamples/SkiaExamples.xib'
], ],
} }],
], ],
],
} }
], ],
} }

2
gyp/flags.gyp
View File

@ -6,8 +6,8 @@
'target_name': 'flags', 'target_name': 'flags',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
'../tools/flags/SkCommandLineFlags.h',
'../tools/flags/SkCommandLineFlags.cpp', '../tools/flags/SkCommandLineFlags.cpp',
'../tools/flags/SkCommandLineFlags.h',
], ],
'dependencies': [ 'dependencies': [
'skia_lib.gyp:skia_lib', 'skia_lib.gyp:skia_lib',

5
gyp/pathops_unittest.gyp
View File

@ -16,7 +16,6 @@
'../src/pdf', '../src/pdf',
'../src/pipe/utils', '../src/pipe/utils',
'../src/utils', '../src/utils',
'../tools/',
], ],
'includes': [ 'includes': [
'pathops_unittest.gypi', 'pathops_unittest.gypi',
@ -28,12 +27,12 @@
'../tests/PathOpsOpLoopThreadedTest.cpp', '../tests/PathOpsOpLoopThreadedTest.cpp',
'../tests/PathOpsSkpClipTest.cpp', '../tests/PathOpsSkpClipTest.cpp',
'../tests/Test.cpp', '../tests/Test.cpp',
'../tests/skia_test.cpp',
'../tests/Test.h', '../tests/Test.h',
'../tests/skia_test.cpp',
], ],
'dependencies': [ 'dependencies': [
'skia_lib.gyp:skia_lib',
'flags.gyp:flags', 'flags.gyp:flags',
'skia_lib.gyp:skia_lib',
], ],
'conditions': [ 'conditions': [
[ 'skia_gpu == 1', { [ 'skia_gpu == 1', {

5
gyp/tools.gyp
View File

@ -159,13 +159,12 @@
'../tools/skpdiff/SkImageDiffer.cpp', '../tools/skpdiff/SkImageDiffer.cpp',
'../tools/skpdiff/SkPMetric.cpp', '../tools/skpdiff/SkPMetric.cpp',
'../tools/skpdiff/skpdiff_util.cpp', '../tools/skpdiff/skpdiff_util.cpp',
'../tools/flags/SkCommandLineFlags.cpp',
], ],
'include_dirs': [ 'include_dirs': [
'../tools/flags',
'../src/core/', # needed for SkTLList.h '../src/core/', # needed for SkTLList.h
], ],
'dependencies': [ 'dependencies': [
'flags.gyp:flags',
'skia_lib.gyp:skia_lib', 'skia_lib.gyp:skia_lib',
], ],
'cflags': [ 'cflags': [
@ -282,7 +281,6 @@
'../tools/skpinfo.cpp', '../tools/skpinfo.cpp',
], ],
'include_dirs': [ 'include_dirs': [
'../tools/flags',
'../src/core/', '../src/core/',
], ],
'dependencies': [ 'dependencies': [
@ -301,7 +299,6 @@
'../src/core/', '../src/core/',
'../src/images', '../src/images',
'../src/lazy', '../src/lazy',
'../tools/flags',
], ],
'dependencies': [ 'dependencies': [
'flags.gyp:flags', 'flags.gyp:flags',

141
gyp/v8.gyp
View File

@ -6,88 +6,83 @@
'type': 'executable', 'type': 'executable',
'mac_bundle' : 1, 'mac_bundle' : 1,
'include_dirs' : [ 'include_dirs' : [
'../tools/flags',
'../third_party/externals/v8/include', '../third_party/externals/v8/include',
],
'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',
'-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',
], ],
'sources': [ },
'../experimental/SkV8Example/SkV8Example.cpp', 'conditions' : [
'../experimental/SkV8Example/SkV8Example.h', [ 'skia_gpu == 1', {
'../experimental/SkV8Example/Global.cpp', 'include_dirs' : [
'../experimental/SkV8Example/Global.h', '../src/gpu',
'../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': [
# '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"', { [ 'skia_os == "win"', {
'sources' : [ 'sources' : [
'../src/views/win/SkOSWindow_Win.cpp', '../src/views/win/SkOSWindow_Win.cpp',
'../src/views/win/skia_win.cpp', '../src/views/win/skia_win.cpp',
], ],
}, }],
],
[ 'skia_os == "mac"', { [ 'skia_os == "mac"', {
'sources': [ 'sources': [
'../src/views/mac/SampleAppDelegate.h',
'../src/views/mac/SampleAppDelegate.h', '../src/views/mac/SampleAppDelegate.mm',
'../src/views/mac/SampleAppDelegate.mm', '../src/views/mac/SkEventNotifier.mm',
'../src/views/mac/SkEventNotifier.mm', '../src/views/mac/skia_mac.mm',
'../src/views/mac/skia_mac.mm', '../src/views/mac/SkNSView.h',
'../src/views/mac/SkNSView.h', '../src/views/mac/SkNSView.mm',
'../src/views/mac/SkNSView.mm', '../src/views/mac/SkOptionsTableView.h',
'../src/views/mac/SkOptionsTableView.h', '../src/views/mac/SkOptionsTableView.mm',
'../src/views/mac/SkOptionsTableView.mm', '../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/SkOSWindow_Mac.mm', '../src/views/mac/SkTextFieldCell.h',
'../src/views/mac/SkTextFieldCell.h', '../src/views/mac/SkTextFieldCell.m',
'../src/views/mac/SkTextFieldCell.m',
], ],
'include_dirs' : [ 'include_dirs' : [
'../src/views/mac/' '../src/views/mac/'
], ],
'xcode_settings' : { 'xcode_settings' : {
'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist', 'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
}, },
'mac_bundle_resources' : [ 'mac_bundle_resources' : [
'../experimental/SkiaExamples/SkiaExamples.xib' '../experimental/SkiaExamples/SkiaExamples.xib'
], ],
} }],
], ],
],
} }
], ],
} }