Commit da8c5add authored by Ghislain MARY's avatar Ghislain MARY

Some fixes for stuffs that have been broken during rework.

parent 57fa9716
......@@ -37,7 +37,7 @@ if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
if(NOT DISABLE_BC_ANTLR)
lcb_dependencies("antlr3c")
endif()
if (NOT QNX)
if(NOT APPLE AND NOT ANDROID AND NOT QNX)
lcb_dependencies("zlib")
endif()
endif()
......
......@@ -30,7 +30,7 @@ lcb_dependencies("bctoolbox" "bellesip" "ortp" "ms2")
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT APPLE)
# Do not build sqlite3, xml2 and zlib on Apple systems (Mac OS X and iOS), they are provided by the system
lcb_dependencies("sqlite3" "xml2")
if (NOT QNX)
if(NOT ANDROID AND NOT QNX)
lcb_dependencies("zlib")
endif()
endif()
......
......@@ -1172,10 +1172,14 @@ macro(lcb_rpmbuild_name RPMBUILD_NAME)
lcb_builder_rpmbuild_name("${LINPHONE_BUILDER_CURRENT_BUILDER}" "${RPMBUILD_NAME}")
endmacro()
macro(lcb_plugin BOOL_VALUE)
macro(lcb_builder_plugin BUILDER BOOL_VALUE)
set(EP_${BUILDER}_PLUGIN ${BOOL_VALUE})
endmacro()
macro(lcb_plugin BOOL_VALUE)
lcb_builder_plugin("${LINPHONE_BUILDER_CURRENT_BUILDER}" ${BOOL_VALUE})
endmacro()
macro(lcb_builder_build_method BUILDER BUILD_METHOD)
set(EP_${BUILDER}_BUILD_METHOD "${BUILD_METHOD}")
endmacro()
......
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