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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/zlib/zlib.scons

Issue 16605: Add zlib/contrib/minizip to third_party/zlib... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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
« no previous file with comments | « third_party/zlib/contrib/minizip/zip.c ('k') | third_party/zlib/zlib.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.scons
===================================================================
--- third_party/zlib/zlib.scons (revision 7480)
+++ third_party/zlib/zlib.scons (working copy)
@@ -50,8 +50,18 @@
'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 @@
'$(SolutionDir)../build/common.vsprops',
'$(SolutionDir)../build/debug.vsprops',
'$(SolutionDir)../build/external_code.vsprops',
+ './zlib.vsprops'
])
p.AddConfig('Release|Win32',
@@ -77,6 +88,7 @@
'$(SolutionDir)../build/common.vsprops',
'$(SolutionDir)../build/release.vsprops',
'$(SolutionDir)../build/external_code.vsprops',
+ './zlib.vsprops'
])
env.AlwaysBuild(p)
« no previous file with comments | « third_party/zlib/contrib/minizip/zip.c ('k') | third_party/zlib/zlib.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698