summaryrefslogtreecommitdiffstats
path: root/webkit/build/JavaScriptCore
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 03:27:22 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 03:27:22 +0000
commita1808527030b635ba132a1e0d5e3de22dd44b20b (patch)
tree62dc94441cc00e8b56323ff7eee71cd3466cafdc /webkit/build/JavaScriptCore
parent52f693bfdbbe27540c1c8c6cd77678d8ff62c91f (diff)
downloadchromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.zip
chromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.tar.gz
chromium_src-a1808527030b635ba132a1e0d5e3de22dd44b20b.tar.bz2
non-third_party side of merge 38389:38450.
Review URL: http://codereview.chromium.org/11301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
-rw-r--r--webkit/build/JavaScriptCore/SConscript1
-rw-r--r--webkit/build/JavaScriptCore/WTF.vcproj12
2 files changed, 13 insertions, 0 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 768d3af..38f2fd0 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -148,6 +148,7 @@ if env['PLATFORM'] == 'win32':
wtf_inputs = [
'$WTF_DIR/Assertions.cpp',
+ '$WTF_DIR/dtoa.cpp',
'$WTF_DIR/FastMalloc.cpp',
'$WTF_DIR/HashTable.cpp',
'$WTF_DIR/MainThread.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 0dc5ef0..c4636de 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -150,6 +150,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\FastMalloc.cpp"
>
</File>
@@ -269,6 +277,10 @@
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RefPtrHashMap.h"
>
</File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StdLibExtras.h"
+ >
+ </File>
<File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\StringExtras.h"
>