diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:07:27 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 22:07:27 +0000 |
| commit | f8d434bd5be573b2954faa2ff4bfef37db6d194e (patch) | |
| tree | 0de372e9941087b7f1c6df83f6d758182de1158d /webkit/build/JavaScriptCore | |
| parent | b096b26c613aa283549fbdc67cbb8e47321d53bd (diff) | |
| download | chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.zip chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.tar.gz chromium_src-f8d434bd5be573b2954faa2ff4bfef37db6d194e.tar.bz2 | |
Update the SCons build for the WebKit merge:
* Update relevant file lists.
* Modify CPPPATH directory lists to mirror the VS build.
* Add new command-line defines.
* Remove an incorrect /css/ subdirectory from the generated CSS*.in paths
so the DAG properly hooks them up with the right source files.
* Change the idiom when we exclude files that just haven't been ported
yet: keep all the to-be-ported files on the global list, and explicitly
remove them on the necessary platforms. (This should make it a little
easier to verify that we have all the right files, and the config
change when porting a file will be to just delete the relevant line.)
* Comment the use of addRepository().
Review URL: http://codereview.chromium.org/6323
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 97534f7..5b15591 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -117,8 +117,11 @@ env.Append( CPPDEFINES = [ '__STD_C', 'U_STATIC_IMPLEMENTATION', - ] - ) + ], + CPPPATH = [ + '$WTF_DIR/unicode', + ], +) if env['PLATFORM'] == 'win32': env.Append( @@ -136,7 +139,6 @@ if env['PLATFORM'] == 'win32': CCFLAGS = [ '/TP', - '/WX', '/Wp64', '/wd4127', @@ -150,10 +152,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) |