1 files changed, 32 insertions, 22 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index c00c092..6608ebe 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -41,7 +41,7 @@ hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T
 
 env.Replace(
     CREATE_HASH_TABLE_COM       = hash_table_cmd,
-    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavascriptCore/kjs/create_hash_table'),
+    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table'),
     CREATE_HASH_TABLE_FLAGS     = '-i',
 )
 
@@ -95,7 +95,7 @@ copies = [
     'API/JavaScriptCore.h',
     'bindings/npruntime.h',
     'bindings/runtime.h',
-    'bindings/np_jsobject.h',
+    'bindings/NP_jsobject.h',
     'bindings/npruntime_internal.h',
     'bindings/npruntime_impl.h',
     'bindings/runtime_object.h',
@@ -118,9 +118,7 @@ env.Alias('webkit', i)
 # Stuff for WTF
 env = env.Clone(
     CPPPATH = [
-        '$WEBKIT_DIR/build/JavaScriptCore',
         '$JAVASCRIPTCORE_DIR',
-        '$JAVASCRIPTCORE_DIR/os-win32',
         '$JAVASCRIPTCORE_DIR/kjs',
         '$WTF_DIR',
         '$JAVASCRIPTCORE_DIR/API',
@@ -140,25 +138,37 @@ env.Append(
     CPPDEFINES = [
         'HAVE_CONFIG_H',
         '__STD_C',
-        'CRASH=__debugbreak',
         'U_STATIC_IMPLEMENTATION',
-        '_WIN32_WINNT=0x0600',
-        'WINVER=0x0600',
-    ],
-    CCFLAGS = [
-        '/TP',
-
-        '/WX',
-        '/Wp64',
-
-        '/wd4127',
-        '/wd4355',
-        '/wd4510',
-        '/wd4512',
-        '/wd4610',
-        '/wd4706',
-    ],
-)
+        ]
+    )
+
+if env['PLATFORM'] == 'win32':
+    env.Append(
+        CPPPATH = [
+                # Windows workarounds to not having pthread.h and sched.h
+                '$WEBKIT_DIR/build/JavaScriptCore',
+                # Windows workarounds to not having stdint.h
+                '$JAVASCRIPTCORE_DIR/os-win32',
+                ],
+        CPPDEFINES = [
+                'CRASH=__debugbreak',
+                '_WIN32_WINNT=0x0600',
+                'WINVER=0x0600',
+                ],
+        CCFLAGS = [
+                '/TP',
+
+                '/WX',
+                '/Wp64',
+
+                '/wd4127',
+                '/wd4355',
+                '/wd4510',
+                '/wd4512',
+                '/wd4610',
+                '/wd4706',
+                ],
+        )
 
 wtf_inputs = [
     '$WTF_DIR/Assertions.cpp',