diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 21:37:01 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-10 21:37:01 +0000 |
| commit | cda656f9d58a8ec7b2ed09be1f85e7bd8d2cf8c7 (patch) | |
| tree | 9c9fce788c54c343a4331a5c1fd48fbba67f4b1f /webkit/build/JavaScriptCore | |
| parent | 015e981e25d04b3aba34f4b18f50cc518ea542bc (diff) | |
| download | chromium_src-cda656f9d58a8ec7b2ed09be1f85e7bd8d2cf8c7.zip chromium_src-cda656f9d58a8ec7b2ed09be1f85e7bd8d2cf8c7.tar.gz chromium_src-cda656f9d58a8ec7b2ed09be1f85e7bd8d2cf8c7.tar.bz2 | |
Add $JAVASCRIPTCORE_DIR/wtf to CPPPATH for the Windows build.
Fix the path to ThreadingWin.cpp (duplicated wtf/ subdir).
Review URL: http://codereview.chromium.org/7096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 4fd0481..47a8eee 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -106,6 +106,7 @@ env = env.Clone( '$JAVASCRIPTCORE_DIR/bindings/jni', '$WEBKIT_DIR/pending', '$WEBKIT_DIR/pending/wtf', + '$JAVASCRIPTCORE_DIR/wtf', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', '$WEBKIT_DIR', @@ -164,7 +165,7 @@ wtf_inputs = [ if env['PLATFORM'] == 'win32': wtf_inputs.extend([ '$WTF_DIR/win/MainThreadWin.cpp', - '$WTF_DIR/wtf/ThreadingWin.cpp', + '$WTF_DIR/ThreadingWin.cpp', ]) env.ChromeStaticLibrary('WTF', wtf_inputs) |