Commit 0e83927f authored by Sylvain Berfini's avatar Sylvain Berfini 🎩
Browse files

Fix vpx enabled for i486 bb10 SDK build + add MKV for ARM build

parent 8a5bca2f
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
# #
############################################################################ ############################################################################
include(configs/config-bb10.cmake) set(DEFAULT_VALUE_ENABLE_MKV ON)
set(DEFAULT_VALUE_ENABLE_VPX ON) set(DEFAULT_VALUE_ENABLE_VPX ON)
include(configs/config-bb10.cmake)
# Global configuration # Global configuration
set(LINPHONE_BUILDER_CFLAGS "${LINPHONE_BUILDER_CFLAGS} -march=armv7-a -mfpu=neon") set(LINPHONE_BUILDER_CFLAGS "${LINPHONE_BUILDER_CFLAGS} -march=armv7-a -mfpu=neon")
...@@ -39,4 +40,4 @@ list(APPEND EP_speex_CMAKE_OPTIONS ...@@ -39,4 +40,4 @@ list(APPEND EP_speex_CMAKE_OPTIONS
list(APPEND EP_opus_CONFIGURE_OPTIONS "--enable-fixed-point") list(APPEND EP_opus_CONFIGURE_OPTIONS "--enable-fixed-point")
# vpx # vpx
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic") set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
\ No newline at end of file
...@@ -20,4 +20,7 @@ ...@@ -20,4 +20,7 @@
# #
############################################################################ ############################################################################
set(DEFAULT_VALUE_ENABLE_MKV OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
include(configs/config-bb10.cmake) include(configs/config-bb10.cmake)
...@@ -29,8 +29,6 @@ set(DEFAULT_VALUE_ENABLE_SRTP ON) ...@@ -29,8 +29,6 @@ set(DEFAULT_VALUE_ENABLE_SRTP ON)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON) set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_ENABLE_VIDEO ON) set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_ZRTP ON) set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_MKV OFF)
set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES") set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
...@@ -80,7 +78,7 @@ list(APPEND EP_ms2_CMAKE_OPTIONS ...@@ -80,7 +78,7 @@ list(APPEND EP_ms2_CMAKE_OPTIONS
"-DENABLE_GLX=NO" "-DENABLE_GLX=NO"
"-DENABLE_X11=NO" "-DENABLE_X11=NO"
"-DENABLE_XV=NO" "-DENABLE_XV=NO"
"-DENABLE_MKV=NO" "-DENABLE_MKV=YES"
"-DENABLE_QNX=YES" "-DENABLE_QNX=YES"
"-DENABLE_V4L=NO" "-DENABLE_V4L=NO"
"-DENABLE_UNIT_TESTS=NO" "-DENABLE_UNIT_TESTS=NO"
......
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