| OLD | NEW |
|---|
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 __doc__ = """ | 5 __doc__ = """ |
| 6 Configuration for building zlib.lib / libzlib.a. | 6 Configuration for building zlib.lib / libzlib.a. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| 11 if env.WantSystemLib('zlib'): |
| 12 root_env.Append(ZLIB_LIB = ['z']) |
| 13 Return() |
| 14 |
| 11 env = env.Clone() | 15 env = env.Clone() |
| 12 | 16 |
| 17 env.Append( |
| 18 ZLIB_LIB = ['zlib'], |
| 19 ) |
| 20 |
| 13 if env['PLATFORM'] == 'win32': | 21 if env['PLATFORM'] == 'win32': |
| 14 env.Append( | 22 env.Append( |
| 15 CCFLAGS = [ | 23 CCFLAGS = [ |
| 16 '/TC', | 24 '/TC', |
| 17 '/wd4800', | 25 '/wd4800', |
| 18 ], | 26 ], |
| 19 ) | 27 ) |
| 20 | 28 |
| 21 input_files = [ | 29 input_files = [ |
| 22 'adler32.c', | 30 'adler32.c', |
| 23 'compress.c', | 31 'compress.c', |
| 24 'crc32.c', | 32 'crc32.c', |
| 25 'deflate.c', | 33 'deflate.c', |
| 26 'gzio.c', | 34 'gzio.c', |
| 27 'infback.c', | 35 'infback.c', |
| 28 'inffast.c', | 36 'inffast.c', |
| 29 'inflate.c', | 37 'inflate.c', |
| 30 'inftrees.c', | 38 'inftrees.c', |
| 31 'trees.c', | 39 'trees.c', |
| 32 'uncompr.c', | 40 'uncompr.c', |
| 33 'zutil.c', | 41 'zutil.c', |
| 34 ] | 42 ] |
| 35 | 43 |
| 36 env.ChromeStaticLibrary('zlib', input_files) | 44 env.ChromeStaticLibrary('zlib', input_files) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11430:
Fix use of LOAD= with WantSystemLib()... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/