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',
#'v8.gyp:SkV8Example',
#'webtry.gyp:webtry',
],
],
}],
],
},

101
gyp/experimental.gyp
View File

@ -23,70 +23,57 @@
'target_name': 'SkiaExamples',
'type': 'executable',
'mac_bundle' : 1,
'include_dirs' : [
'../tools/flags',
],
'includes': [],
'sources': [
'../experimental/SkiaExamples/SkExample.h',
'../experimental/SkiaExamples/SkExample.cpp',
'../experimental/SkiaExamples/HelloSkiaExample.cpp',
],
'dependencies': [
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
'flags.gyp:flags'
],
'conditions' : [
[ 'skia_gpu == 1', {
'include_dirs' : [
'../src/gpu', #gl/GrGLUtil.h
]
}],
'sources': [
'../experimental/SkiaExamples/SkExample.h',
'../experimental/SkiaExamples/SkExample.cpp',
'../experimental/SkiaExamples/HelloSkiaExample.cpp',
],
'dependencies': [
'flags.gyp:flags',
'skia_lib.gyp:skia_lib',
'views.gyp:views',
'xml.gyp:xml',
],
'conditions' : [
[ 'skia_gpu == 1', {
'include_dirs' : [
'../src/gpu',
],
}],
[ 'skia_os == "win"', {
'sources' : [
'../src/views/win/SkOSWindow_Win.cpp',
'../src/views/win/skia_win.cpp',
],
},
],
'sources' : [
'../src/views/win/SkOSWindow_Win.cpp',
'../src/views/win/skia_win.cpp',
],
}],
[ 'skia_os == "mac"', {
'sources': [
# SkiaExamples specific files
'../experimental/SkiaExamples/SkiaExamples-Info.plist',
'../experimental/SkiaExamples/SkExampleNSView.h',
'../experimental/SkiaExamples/SkExampleNSView.mm',
# Mac files
'../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',
'../experimental/SkiaExamples/SkiaExamples-Info.plist',
'../experimental/SkiaExamples/SkExampleNSView.h',
'../experimental/SkiaExamples/SkExampleNSView.mm',
'../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/'
],
'link_settings': {
},
'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'
],
}
}],
],
],
}
],
}

2
gyp/flags.gyp
View File

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

5
gyp/pathops_unittest.gyp
View File

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

5
gyp/tools.gyp
View File

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

141
gyp/v8.gyp
View File

@ -6,88 +6,83 @@
'type': 'executable',
'mac_bundle' : 1,
'include_dirs' : [
'../tools/flags',
'../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',
'../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': [
# '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
]
}],
},
'conditions' : [
[ 'skia_gpu == 1', {
'include_dirs' : [
'../src/gpu',
]
}],
[ 'skia_os == "win"', {
'sources' : [
'../src/views/win/SkOSWindow_Win.cpp',
'../src/views/win/skia_win.cpp',
],
},
],
'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'
],
}
}],
],
],
}
],
}