diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-04-05 16:14:07 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-05-17 11:06:01 -0700 |
| commit | dda951924d2d528d4b25c124a1766f9a6a1478dd (patch) | |
| tree | 0bde816723d475b179f829e0705afad5dfcf879d | |
| parent | 0246b690db91bc3b0093fc27dc1bc18c201188a2 (diff) | |
meson: add a zlib subproject
To help windows build
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | subprojects/zlib.wrap | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0f88ddfe8e..9202b84bb1 100644 --- a/meson.build +++ b/meson.build @@ -1007,7 +1007,7 @@ else endif # TODO: some of these may be conditional -dep_zlib = dependency('zlib', version : '>= 1.2.3') +dep_zlib = dependency('zlib', version : '>= 1.2.3', fallback : ['zlib', 'zlib_dep']) pre_args += '-DHAVE_ZLIB' dep_thread = dependency('threads') if dep_thread.found() and host_machine.system() != 'windows' diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap new file mode 100644 index 0000000000..6d5896f796 --- /dev/null +++ b/subprojects/zlib.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = zlib-1.2.8 + +source_url = http://zlib.net/fossils/zlib-1.2.8.tar.gz +source_filename = zlib-1.2.8.tar.gz +source_hash = 36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d + +patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.8/8/get_zip +patch_filename = zlib-1.2.8-8-wrap.zip +patch_hash = 17c52a0e0c59ce926d3959005d5cd8178c6c7e2c9a4a1304279a8320c955ac60 |