From b05c90f8107464ca18d888a251cea7dd7c1b0776 Mon Sep 17 00:00:00 2001
From: "erg@google.com" <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 19 Aug 2008 22:47:45 +0000
Subject: Get JSConfig and JavaScriptCore/libWTF.a building under linux.

- Mainly separating out windows options into env['PLATFROM'] sections.
- Fix for case sensitive filesystems.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1064 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/SConscript | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'webkit/SConscript')

diff --git a/webkit/SConscript b/webkit/SConscript
index 55ceb83..cbf3ed7 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -135,12 +135,8 @@ env.Append(
 
     CPPDEFINES = [
       'U_STATIC_IMPLEMENTATION'
-      '_CRT_SECURE_NO_DEPRECATE',
-      '_CRT_NONSTDC_NO_WARNINGS',
-      '_CRT_NONSTDC_NO_DEPRECATE',
       '_SCL_SECURE_NO_DEPRECATE',
       '_SCL_SECURE_NO_WARNINGS',
-      ['CRASH', '__debugbreak'],
       ['ENABLE_CROSS_DOCUMENT_MESSAGING', '1'],
       ['ENABLE_XSLT', '1'],
       ['ENABLE_XPATH', '1'],
@@ -153,9 +149,6 @@ env.Append(
       ['WEBCORE_NAVIGATOR_PLATFORM', '"\\"Win32\\""'],
       'USE_GOOGLE_URL_LIBRARY',
 
-      '_WIN32_WINNT=0x0600',
-      'WINVER=0x0600',
-
       'LIBXSLT_STATIC',
       'LIBXML_STATIC',
       'PNG_USER_CONFIG',
@@ -168,8 +161,8 @@ env.Append(
     ],
 )
 
-
-sconscript_dirs = [
+if env['PLATFORM'] == 'win32':
+    sconscript_dirs = [
     'SConscript.port',
     'SConscript.javascriptcore_pcre',
     'activex_shim/SConscript',
@@ -186,8 +179,26 @@ sconscript_dirs = [
     'tools/npapi_layout_test_plugin/SConscript',
     'tools/test_shell/SConscript',
     'tools/test_shell/resources/fonts/SConscript',
-]
-
+    ]
+
+    env.Append(
+        CPPDEFINES = [
+                '_CRT_SECURE_NO_DEPRECATE',
+                '_CRT_NONSTDC_NO_WARNINGS',
+                '_CRT_NONSTDC_NO_DEPRECATE',
+                ['CRASH', '__debugbreak'],
+                '_WIN32_WINNT=0x0600',
+                'WINVER=0x0600',
+                ])
+else:
+    sconscript_dirs = [
+# TODO(erg): For now, only JavaScriptCore compiles and links; the rest is next.
+#    'SConscript.port',
+#    'SConscript.javascriptcore_pcre',
+    'build/JSConfig/SConscript',
+    'build/JavaScriptCore/SConscript',
+#    'build/WebCore/SConscript',
+    ]
 env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
 
 # Setup alias for all webkit related targets.
-- 
cgit v1.1