summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:29:00 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:29:00 +0000
commitf3a6786655a1bb961fdddea511f9f8cb7dadce0c (patch)
tree3fbd3dd39a528026326646fb8caf7d5ee63a7e9f /webkit/SConscript
parent8b45aa1d0433769f27038c2f3304a08636e4e233 (diff)
downloadchromium_src-f3a6786655a1bb961fdddea511f9f8cb7dadce0c.zip
chromium_src-f3a6786655a1bb961fdddea511f9f8cb7dadce0c.tar.gz
chromium_src-f3a6786655a1bb961fdddea511f9f8cb7dadce0c.tar.bz2
Some small linux build cleanups:
- Move WTF_USE_ICU_UNICODE from config.h.in to our SConscript file - Fix the include path for libxml/xmlversion.h (use the file copied into Hammer rather than the one from the linux subdir) - Make precompiled_v8bindings.cpp be conditionally added, rather than conditionally removed. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript')
-rw-r--r--webkit/SConscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 084fc73..54b6cce 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -48,6 +48,9 @@ elif env['PLATFORM'] == 'posix':
],
CPPDEFINES = [
'BUILDING_GTK__',
+ # In Platform.h, this doesn't get defined when BUILDING_GTK__ is
+ # defined.
+ 'WTF_USE_ICU_UNICODE',
],
)
@@ -78,6 +81,7 @@ env.Prepend(
'$LIBJPEG_DIR',
'$LIBXSLT_DIR',
'$LIBXML_DIR/include',
+ '$LIBXML_DIR/scons/include',
'$ICU38_DIR/public/common',
'$ICU38_DIR/public/i18n',
'$SKIA_DIR/include',