From 9b7ef2fba9efa3d6d653cfc83468632f080b8245 Mon Sep 17 00:00:00 2001
From: "maruel@google.com"
 <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 9 Oct 2008 14:56:10 +0000
Subject: Revert both 3079 and 3063 because they caused linux and mac breakage.
 Review URL: http://codereview.chromium.org/7015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3098 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/JavaScriptCore/SConscript | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'webkit/build/JavaScriptCore/SConscript')

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 5b15591..97534f7 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -117,11 +117,8 @@ env.Append(
     CPPDEFINES = [
         '__STD_C',
         'U_STATIC_IMPLEMENTATION',
-    ],
-    CPPPATH = [
-        '$WTF_DIR/unicode',
-    ],
-)
+        ]
+    )
 
 if env['PLATFORM'] == 'win32':
     env.Append(
@@ -139,6 +136,7 @@ if env['PLATFORM'] == 'win32':
         CCFLAGS = [
                 '/TP',
 
+                '/WX',
                 '/Wp64',
 
                 '/wd4127',
@@ -152,19 +150,10 @@ if env['PLATFORM'] == 'win32':
 
 wtf_inputs = [
     '$WTF_DIR/Assertions.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',
+    '$WTF_DIR/TCSystemAlloc.cpp',
+    '$WTF_DIR/HashTable.cpp',
 ]
 
-if env['PLATFORM'] == 'win32':
-  wtf_inputs.extend([
-      '$WTF_DIR/win/MainThreadWin.cpp',
-      '$PENDING_DIR/wtf/ThreadingWin.cpp',
-  ])
-
 env.ChromeStaticLibrary('WTF', wtf_inputs)
+
-- 
cgit v1.1