Commit 38c55f44 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Always build libspeexdsp but keep choice of building the speex codec.

parent 852c182b
......@@ -118,6 +118,7 @@ else()
add_dependencies(TARGET_linphone_builder TARGET_ms2)
add_dependencies(TARGET_ms2 TARGET_ortp TARGET_bctoolbox)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
linphone_builder_add_builder_to_target(TARGET_ms2 speex)
if(ENABLE_GSM)
linphone_builder_add_builder_to_target(TARGET_ms2 gsm)
endif()
......@@ -127,9 +128,6 @@ else()
if(ENABLE_OPUS)
linphone_builder_add_builder_to_target(TARGET_ms2 opus)
endif()
if(ENABLE_SPEEX)
linphone_builder_add_builder_to_target(TARGET_ms2 speex)
endif()
if(ENABLE_FFMPEG)
linphone_builder_add_builder_to_target(TARGET_ms2 ffmpeg)
if(ANDROID)
......
......@@ -52,7 +52,7 @@ list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_OPUS=${ENABLE_OPUS}")
if(ENABLE_OPUS AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_ms2_DEPENDENCIES EP_opus)
endif()
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SPEEX=${ENABLE_SPEEX}")
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_SPEEX_CODEC=${ENABLE_SPEEX}")
if(ENABLE_SPEEX AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_ms2_DEPENDENCIES EP_speex)
endif()
......
......@@ -22,10 +22,11 @@
set(EP_speex_GIT_REPOSITORY "git://git.linphone.org/speex.git" CACHE STRING "speex repository URL")
set(EP_speex_GIT_TAG_LATEST "linphone" CACHE STRING "speex tag to use when compiling latest version")
set(EP_speex_GIT_TAG "caeb73052b1171758acb565e7174a49fbd1427d2" CACHE STRING "speex tag to use")
set(EP_speex_GIT_TAG "fc1dd43c3c9d244bca1c300e408ce0373dbd5ed8" CACHE STRING "speex tag to use")
set(EP_speex_EXTERNAL_SOURCE_PATHS "speex" "externals/speex")
set(EP_speex_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
set(EP_speex_CMAKE_OPTIONS "-DENABLE_SPEEX_DSP=YES" "-DENABLE_SPEEX_CODEC=${ENABLE_SPEEX}")
if(MSVC)
set(EP_speex_EXTRA_LDFLAGS "/SAFESEH:NO")
endif()
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