add libpng wrap fallback; fix subprojects .gitignore

This commit is contained in:
Andrei Alexeyev 2019-03-17 20:02:45 +02:00
parent 571d058b52
commit aeae3ca534
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
3 changed files with 10 additions and 4 deletions

View file

@ -104,7 +104,7 @@ endif
static = get_option('static') or (host_machine.system() == 'emscripten')
dep_freetype = dependency('freetype2', required : true, static : static)
dep_png = dependency('libpng', version : '>=1.5', required : true, static : static)
dep_png = dependency('libpng', version : '>=1.5', required : true, static : static, fallback : ['libpng', 'png_dep'])
dep_sdl2 = dependency('sdl2', version : '>=2.0.5', required : true, static : static)
dep_sdl2_mixer = dependency('SDL2_mixer', required : false, static : static)
dep_webp = dependency('libwebp', version : '>=0.5', required : false, static : static)

View file

@ -1,3 +1,4 @@
crossc/
libzip/
zlib/
crossc
libzip
zlib
libpng

5
subprojects/libpng.wrap Normal file
View file

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