summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 15:05:02 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-08 15:05:02 +0000
commitf660b6a9eab863ea371e990006324b45ede3c384 (patch)
tree14e66d18a19864a918351cc28205780456b0f853 /third_party
parent3d53147822dfde54eb32ab00b36a7ceda1a7bcf1 (diff)
downloadchromium_src-f660b6a9eab863ea371e990006324b45ede3c384.zip
chromium_src-f660b6a9eab863ea371e990006324b45ede3c384.tar.gz
chromium_src-f660b6a9eab863ea371e990006324b45ede3c384.tar.bz2
Make the sqlite SConscript file platform-independent.
Update from gothicx. B=1783 Review URL: http://codereview.chromium.org/1615 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/sqlite/SConscript48
1 files changed, 12 insertions, 36 deletions
diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript
index 6d45a34..4ad5b26 100644
--- a/third_party/sqlite/SConscript
+++ b/third_party/sqlite/SConscript
@@ -1,33 +1,6 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Copyright 2008 Google Inc. All Rights Reserved.
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
Import('env')
@@ -53,14 +26,17 @@ env.Append(
'THREADSAFE',
['_HAS_EXCEPTIONS', '0'],
],
+)
- CCFLAGS = [
- '/TC',
+if env['PLATFORM'] == 'win32':
+ env.Append(
+ CCFLAGS = [
+ '/TC',
- '/wd4800',
- '/wd4244',
- ],
-)
+ '/wd4800',
+ '/wd4244',
+ ],
+ )
input_files = [
'alter.c',