summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-13 19:23:36 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-13 19:23:36 +0000
commit5230e923ff48a73d0488ddae7aca3196b1b4ae1e (patch)
tree8b1f3916f880697c013e4341cc4ba9e1c1a9c012 /webkit/SConscript
parentc1afbd2c74edf09456ce6a747d4a0a8f746a6685 (diff)
downloadchromium_src-5230e923ff48a73d0488ddae7aca3196b1b4ae1e.zip
chromium_src-5230e923ff48a73d0488ddae7aca3196b1b4ae1e.tar.gz
chromium_src-5230e923ff48a73d0488ddae7aca3196b1b4ae1e.tar.bz2
Build WebCore on linux. Seems to compile cleanly after disabling warnings.
Review URL: http://codereview.chromium.org/471 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
-rw-r--r--webkit/SConscript4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 2b48314..4615a2d 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -207,6 +207,7 @@ sconscript_dirs = [
'build/JavaScriptCore/SConscript',
'build/port/SConscript',
'build/V8Bindings/SConscript',
+ 'build/WebCore/SConscript',
'default_plugin/SConscript',
'glue/SConscript',
'glue/plugins/test/SConscript',
@@ -220,9 +221,6 @@ if env['PLATFORM'] == 'win32':
'activex_shim/SConscript',
'activex_shim_dll/SConscript',
'build/localized_strings/SConscript',
- 'build/WebCore/SConscript', # This almost works on linux. It requires
- # some changes to WebKit that we'll get
- # in the merge.
])
env.Append(