Commit 21ba4172 authored by Ghislain MARY's avatar Ghislain MARY

Fix build of openh264 on Android and update its version to 1.8.0.

parent 672d045e
......@@ -36,9 +36,9 @@ else()
endif()
endif()
set(OPENH264_VERSION "1.5.0") # Keep this variable, it is used for packaging to know the version to download from Cisco
set(OPENH264_VERSION "1.8.0") # Keep this variable, it is used for packaging to know the version to download from Cisco
lcb_git_repository("https://github.com/cisco/openh264")
lcb_git_tag("v${OPENH264_VERSION}")
lcb_git_tag("openh264v${OPENH264_VERSION}")
lcb_external_source_paths("externals/openh264")
lcb_ignore_warnings(YES)
......@@ -51,13 +51,15 @@ else()
if(MSVC)
lcb_additional_options("OS=\"msvc\"")
elseif(ANDROID)
set(ADDITIONAL_OPTIONS "OS=\"android\" NDKROOT=\"${CMAKE_ANDROID_NDK}\" NDKLEVEL=${CMAKE_ANDROID_API} TARGET=\"android-${CMAKE_ANDROID_API}\"")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
lcb_additional_options("OS=\"android\" NDKROOT=\"${CMAKE_ANDROID_NDK}\" NDKLEVEL=${CMAKE_ANDROID_API} TARGET=\"android-${CMAKE_ANDROID_API}\" ARCH=\"arm\" TOOLCHAINPREFIX=\"${_ANDROID_TOOL_C_TOOLCHAIN_PREFIX}\"")
set(ADDITIONAL_OPTIONS "${ADDITIONAL_OPTIONS} ARCH=\"arm\" INCLUDE_PREFIX=\"arm-linux-androideabi\"")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
lcb_additional_options("OS=\"android\" NDKROOT=\"${CMAKE_ANDROID_NDK}\" NDKLEVEL=${CMAKE_ANDROID_API} TARGET=\"android-${CMAKE_ANDROID_API}\" ARCH=\"arm64\" TOOLCHAINPREFIX=\"${_ANDROID_TOOL_C_TOOLCHAIN_PREFIX}\"")
set(ADDITIONAL_OPTIONS "${ADDITIONAL_OPTIONS} ARCH=\"arm64\" INCLUDE_PREFIX=\"aarch64-linux-android\"")
else()
lcb_additional_options("OS=\"android\" NDKROOT=\"${CMAKE_ANDROID_NDK}\" NDKLEVEL=${CMAKE_ANDROID_API} TARGET=\"android-${CMAKE_ANDROID_API}\" ARCH=\"x86\" TOOLCHAINPREFIX=\"${_ANDROID_TOOL_C_TOOLCHAIN_PREFIX}\"")
set(ADDITIONAL_OPTIONS "${ADDITIONAL_OPTIONS} ARCH=\"x86\" INCLUDE_PREFIX=\"i686-linux-android\"")
endif()
lcb_additional_options("${ADDITIONAL_OPTIONS}")
elseif(APPLE)
if(IOS)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
......
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