diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-01 15:27:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-28 14:11:10 +0000 |
commit | 2fc6bbb87288169f626d662af339568a055a5d4a (patch) | |
tree | 3945c013bcafb47a34f0a22b4bd5d03f0b165c33 /chromium/third_party/libpng | |
parent | 14f62b7b35344887a3bb8f7a2324cb8f362f5a44 (diff) |
Optionally unbundle third_party libraries
Merges gyp files from linux unbundle to third_party so we may optionally
link to the system versions of these libraries.
This affects:
libpng, zlib, minizip, libevent
libwebp, flac, snappy, vpx and jsoncpp
Change-Id: Ic4f2ff412e43d873cd81d85a9ae639f30b53ec7e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/libpng')
-rw-r--r-- | chromium/third_party/libpng/libpng.gyp | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/chromium/third_party/libpng/libpng.gyp b/chromium/third_party/libpng/libpng.gyp index 48b3fa409c2..b9192b250ae 100644 --- a/chromium/third_party/libpng/libpng.gyp +++ b/chromium/third_party/libpng/libpng.gyp @@ -3,6 +3,11 @@ # found in the LICENSE file. { + 'variables': { + 'use_system_libpng%': 0, + }, + 'conditions' : [ + ['use_system_libpng == 0', { 'targets': [ { 'target_name': 'libpng', @@ -87,4 +92,40 @@ ], }, ] + }, # 'use_system_libpng == 0' + { + 'targets': [ + { + 'target_name': 'libpng', + 'type': 'none', + 'dependencies': [ + '../zlib/zlib.gyp:zlib', + ], + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags libpng)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other libpng)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l libpng)', + ], + }, + 'variables': { + 'headers_root_path': '.', + 'header_filenames': [ + 'png.h', + 'pngconf.h', + ], + }, + 'includes': [ + '../../build/shim_headers.gypi', + ], + }, + ], + } + ]] } |