diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:48:10 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 19:48:10 +0000 |
| commit | 8327443a5a5808f784e5fdc693e6d6f1f1beb032 (patch) | |
| tree | cfaaab3fab2de21649f7a6d1c02ca9461503d199 /webkit/build/JavaScriptCore | |
| parent | 40f9788b1c12179b49260aee91fcfe04e219feb4 (diff) | |
| download | chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.zip chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.tar.gz chromium_src-8327443a5a5808f784e5fdc693e6d6f1f1beb032.tar.bz2 | |
WebKit merge hits the SCons build, the sequel:
* Un-revert r3063 (basic file list updates).
* Un-revert r3079 (os-win32 subdirectory).
* Add icu.lib to the npapi_test_plugin.dll link.
* Add libpng.lib to the port.lib link.
* Updates for recently un-forked files.
* Incorporate Linux fixes from phajdan.jr (many thanks):
* Add libxml/linux/include to relevant CPPPATH lists.
* Use -Wno-error to suppress warnings-as-errors.
* Re-order lines in ExceptionContext.
* Remove unused WebCore::SharedBuffer declaration in SkiaUtils.h.
* Spelling fix: V8CSSSTyleDeclaration.h => V8CSSStyleDeclaration.h
Review URL: http://codereview.chromium.org/7024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 97534f7..0718a78 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -117,7 +117,17 @@ env.Append( CPPDEFINES = [ '__STD_C', 'U_STATIC_IMPLEMENTATION', - ] + ], + CPPPATH = [ + '$WTF_DIR/unicode', + ], +) + +if env['PLATFORM'] == 'posix': + env.Append( + CPPDEFINES = [ + 'WTF_USE_ICU_UNICODE', + ], ) if env['PLATFORM'] == 'win32': @@ -136,7 +146,6 @@ if env['PLATFORM'] == 'win32': CCFLAGS = [ '/TP', - '/WX', '/Wp64', '/wd4127', @@ -150,10 +159,19 @@ if env['PLATFORM'] == 'win32': wtf_inputs = [ '$WTF_DIR/Assertions.cpp', - '$WTF_DIR/unicode/UTF8.cpp', - '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/FastMalloc.cpp', '$WTF_DIR/HashTable.cpp', + '$WTF_DIR/MainThread.cpp', + '$WTF_DIR/RefCountedLeakCounter.cpp', + '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/unicode/UTF8.cpp', + '$WTF_DIR/unicode/icu/CollatorICU.cpp', ] -env.ChromeStaticLibrary('WTF', wtf_inputs) +if env['PLATFORM'] == 'win32': + wtf_inputs.extend([ + '$WTF_DIR/win/MainThreadWin.cpp', + '$PENDING_DIR/wtf/ThreadingWin.cpp', + ]) +env.ChromeStaticLibrary('WTF', wtf_inputs) |