summaryrefslogtreecommitdiffstats
path: root/third_party/zlib
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/zlib
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/zlib')
-rw-r--r--third_party/zlib/using_zlib.scons18
-rw-r--r--third_party/zlib/zlib.scons110
2 files changed, 0 insertions, 128 deletions
diff --git a/third_party/zlib/using_zlib.scons b/third_party/zlib/using_zlib.scons
deleted file mode 100644
index 60bceb7..0000000
--- a/third_party/zlib/using_zlib.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 zlib library.
-"""
-
-Import("env")
-
-env.Append(
- CPPPATH = [
- '$ZLIB_DIR',
- ],
- LIBS = [
- 'zlib',
- ],
-)
diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons
deleted file mode 100644
index 8280864..0000000
--- a/third_party/zlib/zlib.scons
+++ /dev/null
@@ -1,110 +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__ = """
-Configuration for building zlib.lib / libzlib.a.
-"""
-
-Import('env')
-
-if env.WantSystemLib('zlib'):
- env.Append(ZLIB_LIB = ['z'])
- Return()
-
-env = env.Clone()
-
-env.Append(
- CPPPATH = ['$ZLIB_DIR'],
- ZLIB_LIB = ['zlib'],
-)
-
-if env.Bit('windows'):
- env.Append(
- CCFLAGS = [
- '/TC',
- '/wd4800',
- ],
- )
-
-minizip_filter = MSVSFilter('minizip', [
- 'contrib/minizip/ioapi.c',
- 'contrib/minizip/ioapi.h',
- 'contrib/minizip/iowin32.c',
- 'contrib/minizip/iowin32.h',
- 'contrib/minizip/unzip.c',
- 'contrib/minizip/unzip.h'
-])
-
-input_files = ChromeFileList([
- minizip_filter,
-
- 'adler32.c',
- 'compress.c',
- 'crc32.c',
- 'crc32.h',
- 'deflate.c',
- 'deflate.h',
- 'gzio.c',
- 'infback.c',
- 'inffast.c',
- 'inffast.h',
- 'inffixed.h',
- 'inflate.c',
- 'inflate.h',
- 'inftrees.c',
- 'inftrees.h',
- 'mozzconf.h',
- 'trees.c',
- 'trees.h',
- 'uncompr.c',
- 'zconf.h',
- 'zlib.h',
- 'zutil.c',
- 'zutil.h',
-])
-
-if not env.Bit('windows'):
- input_files.Remove(
- 'contrib/minizip/iowin32.c',
- 'contrib/minizip/iowin32.h',
- )
-
-if env.Bit('posix'):
- env.Append(
- CCFLAGS = [
- '-Wno-parentheses',
- '-Wno-unused-variable',
- ],
- )
-
-env.ChromeLibrary('zlib', input_files)
-
-p = env.ChromeMSVSProject('zlib.vcproj',
- dest='$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj',
- guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}',
- keyword='Win32Proj',
- files=input_files,
- relative_path_prefix=r'./',
- tools = [
- 'VCLibrarianTool',
- 'VCCLCompilerTool',
- ])
-
-p.AddConfig('Debug|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- '$(SolutionDir)../build/external_code.vsprops',
- './zlib.vsprops'
- ])
-
-p.AddConfig('Release|Win32',
- ConfigurationType = '4',
- InheritedPropertySheets = [
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- '$(SolutionDir)../build/external_code.vsprops',
- './zlib.vsprops'
- ])