summaryrefslogtreecommitdiffstats
path: root/third_party/libjpeg
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 22:05:12 +0000
commit0fad1f1a74408b939d1b09dcc2f9391544e7e692 (patch)
treec62164260c26f143c9ae43c32694142a725bc7eb /third_party/libjpeg
parenta9b826af8ef183810c176b9ede4a2934f4678d50 (diff)
downloadchromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.zip
chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.gz
chromium_src-0fad1f1a74408b939d1b09dcc2f9391544e7e692.tar.bz2
Remove the checked-in scons configuration files.
Review URL: http://codereview.chromium.org/53121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjpeg')
-rw-r--r--third_party/libjpeg/libjpeg.scons143
-rw-r--r--third_party/libjpeg/using_libjpeg.scons18
2 files changed, 0 insertions, 161 deletions
diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons
deleted file mode 100644
index dd9badf..0000000
--- a/third_party/libjpeg/libjpeg.scons
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-if env.WantSystemLib('libjpeg'):
- Return()
-
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
-if env.Bit('windows'):
- env.Append(
- CCFLAGS = [
- '/TC',
- '/wd4800',
- ],
- )
-elif env.Bit('linux'):
- if '-Wall' in env['CCFLAGS']:
- # We're not responsible for bad warning hygiene in this third party code.
- env['CCFLAGS'].remove('-Wall')
-
-input_files = ChromeFileList([
- 'jcapimin.c',
- 'jcapistd.c',
- 'jccoefct.c',
- 'jccolor.c',
- 'jcdctmgr.c',
- 'jchuff.c',
- 'jchuff.h',
- 'jcinit.c',
- 'jcmainct.c',
- 'jcmarker.c',
- 'jcmaster.c',
- 'jcomapi.c',
- 'jconfig.h',
- 'jcparam.c',
- 'jcphuff.c',
- 'jcprepct.c',
- 'jcsample.c',
- 'jdapimin.c',
- 'jdapistd.c',
- 'jdatadst.c',
- 'jdatasrc.c',
- 'jdcoefct.c',
- 'jdcolor.c',
- 'jdct.h',
- 'jddctmgr.c',
- 'jdhuff.c',
- 'jdhuff.h',
- 'jdinput.c',
- 'jdmainct.c',
- 'jdmarker.c',
- 'jdmaster.c',
- 'jdmerge.c',
- 'jdphuff.c',
- 'jdpostct.c',
- 'jdsample.c',
- 'jerror.c',
- 'jerror.h',
- 'jfdctflt.c',
- 'jfdctfst.c',
- 'jfdctint.c',
- 'jidctflt.c',
- 'jidctfst.c',
- 'jidctint.c',
- 'jinclude.h',
- 'jmemmgr.c',
- 'jmemnobs.c',
- 'jmemsys.h',
- 'jmorecfg.h',
- 'jpegint.h',
- 'jpeglib.h',
- 'jquant1.c',
- 'jquant2.c',
- 'jutils.c',
- 'jversion.h',
-])
-
-env.ChromeLibrary('libjpeg', input_files)
-
-p = env.ChromeMSVSProject('libjpeg.vcproj',
- dest=('$CHROME_SRC_DIR/third_party/' +
- 'libjpeg/libjpeg.vcproj'),
- guid='{238CE175-76CE-4A25-A676-69D115885601}',
- keyword='Win32Proj',
- # TODO(sgk): when we can intuit the hierarchy
- # from the built targets.
- #buildtargets=TODO,
- files=input_files,
- relative_path_prefix='./',
- tools=[
- 'VCLibrarianTool',
- 'VCCLCompilerTool',
- ],
- ConfigurationType='4')
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- '$(SolutionDir)../build/external_code.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- '$(SolutionDir)../build/external_code.vsprops',
- ])
diff --git a/third_party/libjpeg/using_libjpeg.scons b/third_party/libjpeg/using_libjpeg.scons
deleted file mode 100644
index d7449f5..0000000
--- a/third_party/libjpeg/using_libjpeg.scons
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-__doc__ = """
-Settings for other components using the libjpeg library.
-"""
-
-Import("env")
-
-env.Append(
- CPPPATH = [
- '$LIBJPEG_DIR',
- ],
- LIBS = [
- 'libjpeg',
- ],
-)