82966b5eed
Reason for revert: Reverting in case this is the cause of the non-Windows failures. Original issue's description: > For consistency, use our homebrew zlib everywhere possible. > > This switches when we build our own zlib from "just Windows" to "everyone, but > not Android framework of course". > > I tested this by building DM for my Mac and for an Android bot config. > It took minor tweaks to the GYP to get ARM builds working. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/5a8f2257b0b0f954fb74f65e7ea3ada772ed9240 TBR=scroggo@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/989873002
96 lines
3.3 KiB
Python
96 lines
3.3 KiB
Python
# Copyright 2014 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
{
|
|
'targets': [
|
|
{
|
|
# Only used by win, down below.
|
|
'target_name' : 'zlib_x86_simd',
|
|
'type': 'static_library',
|
|
'cflags' : ['-msse4.2', '-mpclmul'],
|
|
'sources' : [
|
|
'../third_party/externals/zlib/crc_folding.c',
|
|
'../third_party/externals/zlib/fill_window_sse.c',
|
|
],
|
|
'conditions': [
|
|
['skia_clang_build==1', {
|
|
'msvs_settings': {
|
|
'VCCLCompilerTool': {
|
|
'AdditionalOptions': [ '-msse4.2', '-mpclmul' ],
|
|
},
|
|
},
|
|
}],
|
|
],
|
|
},
|
|
{
|
|
'target_name': 'zlib',
|
|
'direct_dependent_settings': {
|
|
'conditions': [
|
|
[ 'skia_android_framework', { 'include_dirs': [ 'external/zlib' ] }],
|
|
[ 'skia_os == "mac" or skia_os == "ios"', {
|
|
# XCode needs and explicit file path, not a logical name like -lz.
|
|
'link_settings': { 'libraries': [ '$(SDKROOT)/usr/lib/libz.dylib' ] },
|
|
}],
|
|
[ 'skia_os not in ["mac", "ios", "win"]',{
|
|
'link_settings': { 'libraries': [ '-lz' ] },
|
|
}]
|
|
],
|
|
},
|
|
'conditions': [
|
|
[ 'skia_os != "win"', {
|
|
'type': 'none',
|
|
}, {
|
|
# win
|
|
'type': 'static_library',
|
|
'sources': [
|
|
'../third_party/externals/zlib/adler32.c',
|
|
'../third_party/externals/zlib/compress.c',
|
|
'../third_party/externals/zlib/crc32.c',
|
|
'../third_party/externals/zlib/crc32.h',
|
|
'../third_party/externals/zlib/deflate.c',
|
|
'../third_party/externals/zlib/deflate.h',
|
|
'../third_party/externals/zlib/gzclose.c',
|
|
'../third_party/externals/zlib/gzguts.h',
|
|
'../third_party/externals/zlib/gzlib.c',
|
|
'../third_party/externals/zlib/gzread.c',
|
|
'../third_party/externals/zlib/gzwrite.c',
|
|
'../third_party/externals/zlib/infback.c',
|
|
'../third_party/externals/zlib/inffast.c',
|
|
'../third_party/externals/zlib/inffast.h',
|
|
'../third_party/externals/zlib/inffixed.h',
|
|
'../third_party/externals/zlib/inflate.c',
|
|
'../third_party/externals/zlib/inflate.h',
|
|
'../third_party/externals/zlib/inftrees.c',
|
|
'../third_party/externals/zlib/inftrees.h',
|
|
'../third_party/externals/zlib/mozzconf.h',
|
|
'../third_party/externals/zlib/trees.c',
|
|
'../third_party/externals/zlib/trees.h',
|
|
'../third_party/externals/zlib/uncompr.c',
|
|
'../third_party/externals/zlib/x86.h',
|
|
'../third_party/externals/zlib/x86.c',
|
|
'../third_party/externals/zlib/zconf.h',
|
|
'../third_party/externals/zlib/zlib.h',
|
|
'../third_party/externals/zlib/zutil.c',
|
|
'../third_party/externals/zlib/zutil.h',
|
|
],
|
|
'include_dirs': [
|
|
'../third_party/externals/zlib/',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'../third_party/externals/zlib',
|
|
],
|
|
},
|
|
'dependencies': [
|
|
'zlib_x86_simd',
|
|
],
|
|
'defines': [
|
|
'_CRT_NONSTDC_NO_DEPRECATE',
|
|
],
|
|
}],
|
|
],
|
|
}],
|
|
}
|