80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

add zlib wrap fallback; point libzip wrap to a versioned branch

Browse source
This commit is contained in:
Andrei Alexeyev 2019-03-17 19:01:17 +02:00
parent 4443c3358b
commit 571d058b52
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -109,8 +109,8 @@ dep_sdl2 = dependency('sdl2', version : '>=2.0.5', required : t
dep_sdl2_mixer = dependency('SDL2_mixer', required : false, static : static)
dep_webp = dependency('libwebp', version : '>=0.5', required : false, static : static)
dep_webpdecoder = dependency('libwebpdecoder', version : '>=0.5', required : false, static : static)
dep_zlib = dependency('zlib', required : true, static : static, fallback : ['zlib', 'zlib_dep'])
dep_zip = dependency('libzip', version : '>=1.2', required : false, static : static, fallback : ['libzip', 'libzip_dep'])
dep_zlib = dependency('zlib', required : true, static : static)
dep_crypto = dependency('libcrypto', required : false, static : static)
dep_m = cc.find_library('m', required : false)

1
subprojects/.gitignore vendored
View file

@ -1,2 +1,3 @@
crossc/
libzip/
zlib/

2
subprojects/libzip.wrap
View file

@ -2,4 +2,4 @@
directory=libzip
url=https://github.com/taisei-project/libzip.git
push-url=git@github.com:taisei-project/libzip.git
revision=taisei-v1.3
revision=meson-1.5.2a

5
subprojects/zlib.wrap Normal file
View file

@ -0,0 +1,5 @@
[wrap-git]
directory=zlib
url=https://github.com/taisei-project/zlib.git
push-url=git@github.com:taisei-project/zlib.git
revision=meson-1.2.11