Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: third_party/libjpeg/SConscript

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libjpeg/SConscript
===================================================================
--- third_party/libjpeg/SConscript (revision 5775)
+++ third_party/libjpeg/SConscript (working copy)
@@ -1,99 +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()
-
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
-if env['PLATFORM'] == 'win32':
- env.Append(
- CCFLAGS = [
- '/TC',
- '/wd4800',
- ],
- )
-elif env['PLATFORM'] == 'posix':
- if '-Wall' in env['CCFLAGS']:
- # We're not responsible for bad warning hygiene in this third party code.
- env['CCFLAGS'].remove('-Wall')
-
-input_files = [
- 'jcapimin.c',
- 'jcapistd.c',
- 'jccoefct.c',
- 'jccolor.c',
- 'jcdctmgr.c',
- 'jchuff.c',
- 'jcinit.c',
- 'jcmainct.c',
- 'jcmarker.c',
- 'jcmaster.c',
- 'jcomapi.c',
- 'jcparam.c',
- 'jcphuff.c',
- 'jcprepct.c',
- 'jcsample.c',
- 'jdapimin.c',
- 'jdapistd.c',
- 'jdatadst.c',
- 'jdatasrc.c',
- 'jdcoefct.c',
- 'jdcolor.c',
- 'jddctmgr.c',
- 'jdhuff.c',
- 'jdinput.c',
- 'jdmainct.c',
- 'jdmarker.c',
- 'jdmaster.c',
- 'jdmerge.c',
- 'jdphuff.c',
- 'jdpostct.c',
- 'jdsample.c',
- 'jerror.c',
- 'jfdctflt.c',
- 'jfdctfst.c',
- 'jfdctint.c',
- 'jidctflt.c',
- 'jidctfst.c',
- 'jidctint.c',
- 'jmemmgr.c',
- 'jmemnobs.c',
- 'jquant1.c',
- 'jquant2.c',
- 'jutils.c',
-]
-
-env.ChromeStaticLibrary('libjpeg', input_files)

Powered by Google App Engine
This is Rietveld 408576698