diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /WebKit/wx/wscript | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'WebKit/wx/wscript')
| -rw-r--r-- | WebKit/wx/wscript | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/WebKit/wx/wscript b/WebKit/wx/wscript index fa3e06f..f91a69c 100644 --- a/WebKit/wx/wscript +++ b/WebKit/wx/wscript @@ -30,20 +30,20 @@ from settings import * webkit_dirs = ['.', 'WebKitSupport'] include_paths = webkit_dirs + common_includes + ['.', '..', wk_root, - os.path.join(wk_root, 'JavaScriptCore'), - os.path.join(wk_root, 'WebCore'), - os.path.join(wk_root, 'WebCore', 'bindings', 'wx'), - os.path.join(wk_root, 'WebCore', 'DerivedSources'), + os.path.join(wk_root, 'Source', 'JavaScriptCore'), + os.path.join(wk_root, 'Source', 'WebCore'), + os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'DerivedSources'), os.path.join(output_dir), - os.path.join(wk_root, 'WebCore', 'page', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'network', 'curl'), - os.path.join(wk_root, 'WebCore', 'platform', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'bridge', 'wx'), - os.path.join(wk_root, 'WebCore', 'platform', 'graphics', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'page', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'network', 'curl'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'bridge', 'wx'), + os.path.join(wk_root, 'Source', 'WebCore', 'platform', 'graphics', 'wx'), ] if sys.platform.startswith("win"): - include_paths.append(os.path.join(wk_root, 'WebCore','platform','win')) + include_paths.append(os.path.join(wk_root, 'Source', 'WebCore','platform','win')) windows_deps = [ 'lib/pthreadVC2.dll', @@ -54,11 +54,11 @@ windows_deps = [ webcore_include_dirs = [] for dir in webcore_dirs + ['DerivedSources']: - include_paths.append(os.path.join(wk_root, 'WebCore', dir)) + include_paths.append(os.path.join(wk_root, 'Source', 'WebCore', dir)) -js_include_dirs = [os.path.join(wk_root, 'JavaScriptCore', 'assembler')] +js_include_dirs = [os.path.join(wk_root, 'Source', 'JavaScriptCore', 'assembler')] for dir in jscore_dirs: - js_include_dirs.append(os.path.join(wk_root, 'JavaScriptCore', dir)) + js_include_dirs.append(os.path.join(wk_root, 'Source', 'JavaScriptCore', dir)) def set_options(opt): common_set_options(opt) @@ -110,7 +110,7 @@ def build(bld): exts = ['.c', '.cpp'] if sys.platform.startswith('darwin'): exts.append('.mm') - obj.includes += '../mac/WebCoreSupport ../../WebCore/platform/mac' + obj.includes += '../mac/WebCoreSupport ../../Source/WebCore/platform/mac' obj.source = "../mac/WebCoreSupport/WebSystemInterface.mm" obj.find_sources_in_dirs(webkit_dirs) |