| 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 | 5 |
| 6 __doc__ = """ | 6 __doc__ = """ |
| 7 Configuration for building libpng.lib / libpng.a. | 7 Configuration for building libpng.lib / libpng.a. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 Import('env') | 10 Import('env') |
| 11 | 11 |
| 12 if env.WantSystemLib('libpng'): |
| 13 Return() |
| 14 |
| 12 env = env.Clone() | 15 env = env.Clone() |
| 13 | 16 |
| 14 env.SConscript([ | 17 env.SConscript([ |
| 15 '$ZLIB_DIR/using_zlib.scons', | 18 '$ZLIB_DIR/using_zlib.scons', |
| 16 ], {'env':env}) | 19 ], {'env':env}) |
| 17 | 20 |
| 18 env.Prepend( | 21 env.Prepend( |
| 19 CPPPATH = [ | 22 CPPPATH = [ |
| 20 '$CHROME_SRC_DIR', | 23 '$CHROME_SRC_DIR', |
| 21 ], | 24 ], |
| (...skipping 28 matching lines...) Expand all Loading... |
| 50 'pngrio.c', | 53 'pngrio.c', |
| 51 'pngread.c', | 54 'pngread.c', |
| 52 'pngpread.c', | 55 'pngpread.c', |
| 53 'pngmem.c', | 56 'pngmem.c', |
| 54 'pngget.c', | 57 'pngget.c', |
| 55 'pnggccrd.c', | 58 'pnggccrd.c', |
| 56 'pngerror.c', | 59 'pngerror.c', |
| 57 ] | 60 ] |
| 58 | 61 |
| 59 env.ChromeStaticLibrary('libpng', input_files) | 62 env.ChromeStaticLibrary('libpng', input_files) |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11430:
Fix use of LOAD= with WantSystemLib()... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/