| OLD | NEW |
|---|
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 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 'includes': [ | 6 'includes': [ |
| 7 '../../build/common.gypi', | 7 '../../build/common.gypi', |
| 8 ], | 8 ], |
| 9 'targets': [ | 9 'variables': { |
| 10 { | 10 'use_system_libpng%': 0, |
| 11 'target_name': 'libpng', | 11 }, |
| 12 'type': '<(library)', | 12 'conditions': [ |
| 13 'dependencies': [ | 13 ['use_system_libpng==0', { |
| 14 '../zlib/zlib.gyp:zlib', | 14 'targets': [ |
| 15 { |
| 16 'target_name': 'libpng', |
| 17 'type': '<(library)', |
| 18 'dependencies': [ |
| 19 '../zlib/zlib.gyp:zlib', |
| 20 ], |
| 21 'defines': [ |
| 22 'CHROME_PNG_WRITE_SUPPORT', |
| 23 'PNG_USER_CONFIG', |
| 24 ], |
| 25 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', |
| 26 'sources': [ |
| 27 'png.c', |
| 28 'png.h', |
| 29 'pngconf.h', |
| 30 'pngerror.c', |
| 31 'pnggccrd.c', |
| 32 'pngget.c', |
| 33 'pngmem.c', |
| 34 'pngpread.c', |
| 35 'pngread.c', |
| 36 'pngrio.c', |
| 37 'pngrtran.c', |
| 38 'pngrutil.c', |
| 39 'pngset.c', |
| 40 'pngtrans.c', |
| 41 'pngusr.h', |
| 42 'pngvcrd.c', |
| 43 'pngwio.c', |
| 44 'pngwrite.c', |
| 45 'pngwtran.c', |
| 46 'pngwutil.c', |
| 47 ], |
| 48 'direct_dependent_settings': { |
| 49 'include_dirs': [ |
| 50 '.', |
| 51 ], |
| 52 'defines': [ |
| 53 'CHROME_PNG_WRITE_SUPPORT', |
| 54 'PNG_USER_CONFIG', |
| 55 ], |
| 56 }, |
| 57 'export_dependent_settings': [ |
| 58 '../zlib/zlib.gyp:zlib', |
| 59 ], |
| 60 'conditions': [ |
| 61 ['OS!="win"', {'product_name': 'png'}], |
| 62 ], |
| 63 }, |
| 64 ] |
| 65 }, { |
| 66 'targets': [ |
| 67 { |
| 68 'target_name': 'libpng', |
| 69 'type': '<(library)', |
| 70 'dependencies': [ |
| 71 '../zlib/zlib.gyp:zlib', |
| 72 ], |
| 73 'defines': [ |
| 74 'USE_SYSTEM_LIBPNG', |
| 75 ], |
| 76 'direct_dependent_settings': { |
| 77 'cflags': [ |
| 78 '<!@(pkg-config --cflags libpng)', |
| 79 ], |
| 80 }, |
| 81 'link_settings': { |
| 82 'ldflags': [ |
| 83 '<!@(pkg-config --libs-only-L --libs-only-other libpng)', |
| 84 ], |
| 85 'libraries': [ |
| 86 '<!@(pkg-config --libs-only-l libpng)', |
| 87 ], |
| 88 }, |
| 89 }, |
| 15 ], | 90 ], |
| 16 'defines': [ | 91 }], |
| 17 'CHROME_PNG_WRITE_SUPPORT', | |
| 18 'PNG_USER_CONFIG', | |
| 19 ], | |
| 20 'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD', | |
| 21 'sources': [ | |
| 22 'png.c', | |
| 23 'png.h', | |
| 24 'pngconf.h', | |
| 25 'pngerror.c', | |
| 26 'pnggccrd.c', | |
| 27 'pngget.c', | |
| 28 'pngmem.c', | |
| 29 'pngpread.c', | |
| 30 'pngread.c', | |
| 31 'pngrio.c', | |
| 32 'pngrtran.c', | |
| 33 'pngrutil.c', | |
| 34 'pngset.c', | |
| 35 'pngtrans.c', | |
| 36 'pngusr.h', | |
| 37 'pngvcrd.c', | |
| 38 'pngwio.c', | |
| 39 'pngwrite.c', | |
| 40 'pngwtran.c', | |
| 41 'pngwutil.c', | |
| 42 ], | |
| 43 'direct_dependent_settings': { | |
| 44 'include_dirs': [ | |
| 45 '.', | |
| 46 ], | |
| 47 'defines': [ | |
| 48 'CHROME_PNG_WRITE_SUPPORT', | |
| 49 'PNG_USER_CONFIG', | |
| 50 ], | |
| 51 }, | |
| 52 'export_dependent_settings': [ | |
| 53 '../zlib/zlib.gyp:zlib', | |
| 54 ], | |
| 55 'conditions': [ | |
| 56 ['OS!="win"', {'product_name': 'png'}], | |
| 57 ], | |
| 58 }, | |
| 59 ], | 92 ], |
| 60 } | 93 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 159229:
Linux: add GYP variable to use the system libpng. (Closed)
