| 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 'variables': { | 7 'variables': { |
| 8 'skia_warnings_as_errors': 0, | 8 'skia_warnings_as_errors': 0, |
| 9 }, | 9 }, |
| 10 'targets': [ | 10 'targets': [ |
| 11 { | 11 { |
| 12 'target_name': 'zlib', | 12 'target_name': 'zlib', |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 [ 'skia_android_framework', { | 14 [ 'skia_android_framework', { |
| 15 'type': 'none', | 15 'type': 'none', |
| 16 'direct_dependent_settings': { | 16 'direct_dependent_settings': { |
| 17 'include_dirs': [ 'external/zlib' ], | 17 'include_dirs': [ 'external/zlib' ], |
| 18 'link_settings': { 'libraries': [ '-lz' ] }, | 18 'link_settings': { 'libraries': [ '-lz' ] }, |
| 19 }, | 19 }, |
| 20 }, { | 20 }, { |
| 21 'type': 'static_library', | 21 'type': 'static_library', |
| 22 'variables': { | 22 'variables': { |
| 23 'skia_zlib_flags' : [ | 23 'skia_zlib_flags' : [ |
| 24 '-Wno-unused-value', | 24 '-Wno-unused-value', |
| 25 '-Wno-shift-negative-value', | 25 '-Wno-shift-negative-value', |
| 26 '-Wno-unknown-warning-option', |
| 26 ], | 27 ], |
| 27 }, | 28 }, |
| 28 'cflags': [ '<@(skia_zlib_flags)' ], | 29 'cflags': [ '<@(skia_zlib_flags)' ], |
| 29 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_zlib_flags)' ], }, | 30 'xcode_settings': { 'WARNING_CFLAGS': [ '<@(skia_zlib_flags)' ], }, |
| 30 'sources': [ | 31 'sources': [ |
| 31 '../third_party/externals/zlib/adler32.c', | 32 '../third_party/externals/zlib/adler32.c', |
| 32 '../third_party/externals/zlib/compress.c', | 33 '../third_party/externals/zlib/compress.c', |
| 33 '../third_party/externals/zlib/crc32.c', | 34 '../third_party/externals/zlib/crc32.c', |
| 34 '../third_party/externals/zlib/deflate.c', | 35 '../third_party/externals/zlib/deflate.c', |
| 35 '../third_party/externals/zlib/gzclose.c', | 36 '../third_party/externals/zlib/gzclose.c', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 53 '../third_party/externals/zlib', | 54 '../third_party/externals/zlib', |
| 54 ], | 55 ], |
| 55 }, | 56 }, |
| 56 'defines': [ | 57 'defines': [ |
| 57 '_CRT_NONSTDC_NO_DEPRECATE', | 58 '_CRT_NONSTDC_NO_DEPRECATE', |
| 58 ], | 59 ], |
| 59 }], | 60 }], |
| 60 ], | 61 ], |
| 61 }], | 62 }], |
| 62 } | 63 } |
| OLD | NEW |