summaryrefslogtreecommitdiffstats
path: root/third_party/zlib/zlib.scons
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-30 00:40:04 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-30 00:40:04 +0000
commit28f0047ac9d9cb407d72daa044d6b4ebfd339e87 (patch)
tree5490cbd21c180e54c1efa495997cd5d5236fcabc /third_party/zlib/zlib.scons
parent589abbb3dc82525779a410794c03cce602ae6d8a (diff)
downloadchromium_src-28f0047ac9d9cb407d72daa044d6b4ebfd339e87.zip
chromium_src-28f0047ac9d9cb407d72daa044d6b4ebfd339e87.tar.gz
chromium_src-28f0047ac9d9cb407d72daa044d6b4ebfd339e87.tar.bz2
Add zlib/contrib/minizip to third_party/zlib
This adds support for reading the .zip archive file format, which we're using in extensions. Review URL: http://codereview.chromium.org/16605 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/zlib.scons')
-rw-r--r--third_party/zlib/zlib.scons12
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons
index 5aa0299..39a04dd 100644
--- a/third_party/zlib/zlib.scons
+++ b/third_party/zlib/zlib.scons
@@ -50,8 +50,18 @@ input_files = ChromeFileList([
'zlib.h',
'zutil.c',
'zutil.h',
+ 'contrib/minizip/ioapi.c',
+ 'contrib/minizip/ioapi.h',
+ 'contrib/minizip/unzip.c',
+ 'contrib/minizip/unzip.h'
])
+if env.Bit('windows'):
+ input_files.extend([
+ 'contrib/minizip/iowin32.c',
+ 'contrib/minizip/iowin32.h',
+ ])
+
env.ChromeLibrary('zlib', input_files)
p = env.ChromeMSVSProject('zlib.vcproj',
@@ -69,6 +79,7 @@ p.AddConfig('Debug|Win32',
'$(SolutionDir)../build/common.vsprops',
'$(SolutionDir)../build/debug.vsprops',
'$(SolutionDir)../build/external_code.vsprops',
+ './zlib.vsprops'
])
p.AddConfig('Release|Win32',
@@ -77,6 +88,7 @@ p.AddConfig('Release|Win32',
'$(SolutionDir)../build/common.vsprops',
'$(SolutionDir)../build/release.vsprops',
'$(SolutionDir)../build/external_code.vsprops',
+ './zlib.vsprops'
])
env.AlwaysBuild(p)