diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 22:47:45 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 22:47:45 +0000 |
| commit | b05c90f8107464ca18d888a251cea7dd7c1b0776 (patch) | |
| tree | 829061330ac1f6256e7221272ff33e04830ee0d5 /webkit/build/WebCore | |
| parent | 5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf (diff) | |
| download | chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.zip chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.tar.gz chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.tar.bz2 | |
Get JSConfig and JavaScriptCore/libWTF.a building under linux.
- Mainly separating out windows options into env['PLATFROM'] sections.
- Fix for case sensitive filesystems.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/WebCore')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index a421e6b..ab7a703 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -31,28 +31,20 @@ Import('env') env = env.Clone() -env.Append( - CCFLAGS = [ - '/TP', - - '/wd4138', - '/wd4244', - '/wd4291', - '/wd4305', - '/wd4521', - '/wd4099', - '/wd4800', - ], -) - - -env_p = env.Clone() -env_p.Append(CCFLAGS='/Ylwebcore') -pch, obj = env_p.PCH('../precompiled_webkit.cc') -env['PCH'] = pch -env['PCHSTOP'] = 'precompiled_webkit.h' -env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) - +if env['PLATFORM'] == 'win32': + env.Append( + CCFLAGS = [ + '/TP', + + '/wd4138', + '/wd4244', + '/wd4291', + '/wd4305', + '/wd4521', + '/wd4099', + '/wd4800', + ], + ) input_files = [ '$PENDING_DIR/JSSVGLazyEventListener.cpp', @@ -699,4 +691,14 @@ input_files = [ '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp', ] -env.ChromeStaticLibrary('WebCore', input_files + [obj]) +# Precompiled headers only work under MSVC in scons. +if env['PLATFORM'] == 'win32': + env_p = env.Clone() + env_p.Append(CCFLAGS='/Ylwebcore') + pch, obj = env_p.PCH('../precompiled_webkit.cc') + env['PCH'] = pch + env['PCHSTOP'] = 'precompiled_webkit.h' + env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) + input_files += [obj] + +env.ChromeStaticLibrary('WebCore', input_files) |