diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebCore/wscript | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebCore/wscript')
| -rw-r--r-- | WebCore/wscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/wscript b/WebCore/wscript index f183071..3719b84 100644 --- a/WebCore/wscript +++ b/WebCore/wscript @@ -31,7 +31,6 @@ webcore_sources = {} if build_port == "wx": webcore_sources['plugins'] = [ 'plugins/PluginDataNone.cpp', - 'plugins/PluginPackageNone.cpp', 'plugins/PluginViewNone.cpp' ] @@ -43,15 +42,17 @@ if build_port == "wx": # widely available (it was fixed in 2.8.10). 'platform/win/SharedTimerWin.cpp', 'page/win/PageWin.cpp', - + 'plugins/win/PluginPackageWin.cpp', ] elif sys.platform.startswith('darwin'): webcore_dirs.append('platform/wx/wxcode/mac/carbon') webcore_sources['wx-mac'] = [ 'platform/mac/PurgeableBufferMac.cpp', ] + webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp') else: webcore_dirs.append('platform/wx/wxcode/gtk') + webcore_sources['plugins'].append('plugins/PluginPackageNone.cpp') from TaskGen import taskgen, feature, after import Task, ccroot @@ -116,7 +117,7 @@ def build(bld): source = ' '.join(flattenSources(webcore_sources.values())), cxxflags = cxxflags, target = 'webcore', - uselib = 'WX ICU XML XSLT CURL ' + get_config(), + uselib = 'WX ICU XML XSLT CURL SQLITE3 ' + get_config(), uselib_local = '', install_path = output_dir, ) |