diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/wscript | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/wscript')
| -rw-r--r-- | WebCore/wscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/wscript b/WebCore/wscript index eeb0802..f183071 100644 --- a/WebCore/wscript +++ b/WebCore/wscript @@ -76,12 +76,11 @@ def set_options(opt): def configure(conf): common_configure(conf) + generate_webcore_derived_sources() def build(bld): import Options - generate_webcore_derived_sources() - wk_includes = ['.', '..', 'DerivedSources', wk_root, os.path.join(wk_root, 'JavaScriptCore'), @@ -117,7 +116,7 @@ def build(bld): source = ' '.join(flattenSources(webcore_sources.values())), cxxflags = cxxflags, target = 'webcore', - uselib = 'WX ICU XML XSLT CURL ' + waf_configname, + uselib = 'WX ICU XML XSLT CURL ' + get_config(), uselib_local = '', install_path = output_dir, ) @@ -127,6 +126,11 @@ def build(bld): excludes = get_excludes(webcore_dir, ['*None.cpp', '*CF.cpp', '*Qt.cpp', '*Win.cpp', '*Wince.cpp', '*Gtk.cpp', '*Mac.cpp', '*Safari.cpp', '*Chromium*.cpp','*SVG*.cpp', '*AllInOne.cpp', 'test*bindings.*']) excludes.extend(['UserStyleSheetLoader.cpp', 'RenderMediaControls.cpp']) + + # FIXME: undo this once these classes are fully implemented + excludes.append('SocketStreamErrorBase.cpp') + excludes.append('SocketStreamHandleBase.cpp') + # intermediate sources excludes.append('CSSValueKeywords.c') excludes.append('CSSPropertyNames.cpp') |