AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For consistency, use our homebrew zlib everywhere possible.

Browse Source 
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:

Review URL: https://codereview.chromium.org/971673005
This commit is contained in:
mtklein 2015-03-06 16:15:16 -08:00 committed by Commit bot
parent 9ce30e1cd1
commit 5a8f2257b0
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gyp/zlib.gyp
View File

@ -4,45 +4,47 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'variables': {
'skia_warnings_as_errors': 0,
},
'targets': [ 'targets': [
{ {
# Only used by win, down below.
'target_name' : 'zlib_x86_simd', 'target_name' : 'zlib_x86_simd',
'type': 'static_library', 'type': 'static_library',
'cflags' : ['-msse4.2', '-mpclmul'], 'cflags' : ['-msse4.2', '-mpclmul'],
'xcode_settings': {
'OTHER_CFLAGS': ['-msse4.2', '-mpclmul'],
},
'sources' : [ 'sources' : [
'../third_party/externals/zlib/x86.h',
'../third_party/externals/zlib/x86.c',
'../third_party/externals/zlib/crc_folding.c', '../third_party/externals/zlib/crc_folding.c',
'../third_party/externals/zlib/fill_window_sse.c', '../third_party/externals/zlib/fill_window_sse.c',
], ],
'conditions': [ 'conditions': [
['skia_clang_build==1', { ['skia_clang_build==1', {
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'AdditionalOptions': [ '-msse4.2', '-mpclmul' ], 'AdditionalOptions': [ '-msse4.2', '-mpclmul' ],
},
}, },
}], },
], }],
['skia_os in ["linux", "chromeos"]', {
'all_dependent_settings': {
'libraries': [ '-lpthread' ],
},
}],
],
}, },
{ {
'target_name': 'zlib', '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': [ 'conditions': [
[ 'skia_os != "win"', { [ 'skia_android_framework', {
'type': 'none', 'type': 'none',
}, { 'direct_dependent-settings': {
# win 'include_dirs': [ 'external/zlib' ]
},
},{
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
'../third_party/externals/zlib/adler32.c', '../third_party/externals/zlib/adler32.c',
@ -68,8 +70,6 @@
'../third_party/externals/zlib/trees.c', '../third_party/externals/zlib/trees.c',
'../third_party/externals/zlib/trees.h', '../third_party/externals/zlib/trees.h',
'../third_party/externals/zlib/uncompr.c', '../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/zconf.h',
'../third_party/externals/zlib/zlib.h', '../third_party/externals/zlib/zlib.h',
'../third_party/externals/zlib/zutil.c', '../third_party/externals/zlib/zutil.c',
@ -83,8 +83,12 @@
'../third_party/externals/zlib', '../third_party/externals/zlib',
], ],
}, },
'dependencies': [ 'conditions': [
'zlib_x86_simd', [ '"x86" in skia_arch_type', {
'dependencies': [ 'zlib_x86_simd' ],
},{
'sources': ['../third_party/externals/zlib/simd_stub.c'],
}]
], ],
'defines': [ 'defines': [
'_CRT_NONSTDC_NO_DEPRECATE', '_CRT_NONSTDC_NO_DEPRECATE',