| OLD | NEW |
| 1 # Copyright 2014 Google Inc. | 1 # Copyright 2014 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 { | 6 { |
| 7 'targets': [{ | 7 'targets': [{ |
| 8 'target_name': 'zlib', | 8 'target_name': 'zlib', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'direct_dependent_settings': { | 10 'direct_dependent_settings': { |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }], | 12 [ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }], |
| 13 [ 'skia_os == "mac" or skia_os == "ios"', { | 13 [ 'skia_os == "mac" or skia_os == "ios"', { |
| 14 # XCode needs and explicit file path, not a logical name like -lz. | 14 # XCode needs and explicit file path, not a logical name like -lz. |
| 15 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ]
}, | 15 'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ]
}, |
| 16 },{ | 16 },{ |
| 17 'link_settings': { 'libraries': [ '-lz' ] }, | 17 'link_settings': { 'libraries': [ '-lz' ] }, |
| 18 }] | 18 }] |
| 19 ], | 19 ], |
| 20 }, | 20 }, |
| 21 },{ |
| 22 'target_name': 'miniz', |
| 23 'type': 'none', |
| 24 'direct_dependent_settings': { |
| 25 'include_dirs': [ '../third_party/miniz' ], |
| 26 'defines': [ 'ZLIB_INCLUDE="miniz.c"' ], |
| 27 }, |
| 21 }], | 28 }], |
| 22 } | 29 } |
| OLD | NEW |