Commit 3204b2b0 authored by Ghislain MARY's avatar Ghislain MARY

Fix zlib statically on desktop to prevent conflict with zlib from Qt.

parent 22aa03ef
......@@ -23,6 +23,6 @@
lcb_git_repository("https://gitlab.linphone.org/BC/public/external/zlib.git")
lcb_git_tag_latest("master")
lcb_git_tag("91eb77a7c5bfe7b4cc6b722aa96548d7143a9936")
lcb_external_source_paths("externals/zlib")
lcb_external_source_paths("externals/zlib" "external/zlib")
lcb_may_be_found_on_system(YES)
lcb_ignore_warnings(YES)
......@@ -139,3 +139,8 @@ endif()
if(WIN32)
lcb_builder_linking_type(vpx "--enable-static" "--disable-shared" "--enable-pic")
endif()
# zlib
lcb_builder_linking_type(zlib "-DENABLE_SHARED=NO" "-DENABLE_STATIC=YES")
lcb_builder_extra_cflags(zlib "-fPIC")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment