Skip to content

Commit 4eda161

Browse files
authored
Merge pull request #21 from ccrma/zlib_deps
Add zlib as subproject to avoid dynamic dependency
2 parents 6c05660 + 503a0eb commit 4eda161

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/meson.build

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ chump_lib_sources = [
1010
# Fetch the dependency
1111
nlohmann_json_dep = subproject('nlohmann_json').get_variable('nlohmann_json_dep')
1212
openssl_dep = subproject('openssl', default_options: ['prefer_static=true'], required: true).get_variable('openssl_dep')
13+
zlib_dep = subproject('zlib', default_options: ['prefer_static=true'], required: true).get_variable('zlib_dep')
1314
libcurl_dep = subproject('curl', default_options: ['prefer_static=true'], required: true).get_variable('curl_dep')
1415
minizip_dep = subproject('minizip-ng', default_options: ['prefer_static=true'], required: true).get_variable('minizip_ng_dep')
1516

@@ -20,10 +21,10 @@ chump_lib = static_library(
2021
'chump_lib',
2122
sources: chump_lib_sources,
2223
include_directories : inc,
23-
dependencies : [nlohmann_json_dep, libcurl_dep, openssl_dep, minizip_dep, cheaders_dep],
24+
dependencies : [nlohmann_json_dep, libcurl_dep, openssl_dep, minizip_dep, cheaders_dep, zlib_dep],
2425
)
2526

2627
chump_lib_dep = declare_dependency(
27-
dependencies: [nlohmann_json_dep, libcurl_dep, openssl_dep, minizip_dep, cheaders_dep],
28+
dependencies: [nlohmann_json_dep, libcurl_dep, openssl_dep, minizip_dep, cheaders_dep, zlib_dep],
2829
include_directories : inc,
2930
link_with : chump_lib)

subprojects/zlib.wrap

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[wrap-file]
2+
directory = zlib-1.3.1
3+
source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
4+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
5+
source_filename = zlib-1.3.1.tar.gz
6+
source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
7+
patch_filename = zlib_1.3.1-1_patch.zip
8+
patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
9+
patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
10+
wrapdb_version = 1.3.1-1
11+
12+
[provide]
13+
zlib = zlib_dep

0 commit comments

Comments
 (0)