Commit 9f2d4a88 authored by Ghislain MARY's avatar Ghislain MARY

Add option to embed the OpenH264 library on Android.

parent 4c0230af
......@@ -48,9 +48,6 @@ if(LINPHONE_BUILDER_CHECK_LATEST)
else()
include(CMakeDependentOption)
include(FeatureSummary)
if(NOT DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE)
set(DEFAULT_VALUE_CMAKE_PLUGIN_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
endif()
......
......@@ -20,7 +20,9 @@
#
############################################################################
include(CMakeDependentOption)
include(ExternalProject)
include(FeatureSummary)
set(ep_base "${LINPHONE_BUILDER_WORK_DIR}/${CONFIG_NAME}")
set_property(DIRECTORY PROPERTY EP_BASE ${ep_base})
......
......@@ -20,6 +20,10 @@
#
############################################################################
# Define options that are specific to the android config
lcb_add_dependent_option("Embedded OpenH264" "Embed the openh264 library instead of downloading it from Cisco." "${DEFAULT_VALUE_ENABLE_EMBEDDED_OPENH264}" "ENABLE_OPENH264" OFF)
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
......@@ -57,6 +61,7 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armeabi" AND ENABLE_VIDEO)
endif()
# Include builders
include(builders/CMakeLists.txt)
......@@ -109,7 +114,9 @@ lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
lcb_builder_linking_type(ms2 "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")
# openh264
lcb_builder_linking_type(openh264 "-shared")
if(NOT ENABLE_EMBEDDED_OPENH264)
lcb_builder_linking_type(openh264 "-shared")
endif()
# opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
......
......@@ -21,7 +21,6 @@
############################################################################
# Define options that are specific to the desktop config
lcb_add_option("Theora" "Theora video encoding/decoding support." "${DEFAULT_VALUE_ENABLE_THEORA}")
lcb_add_option("Static only" "Enable compilation of libraries in static mode." "${DEFAULT_VALUE_ENABLE_STATIC_ONLY}")
lcb_add_option("Packaging" "Enable packaging" "${DEFAULT_VALUE_ENABLE_PACKAGING}")
......
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