Commit 2bfe93e6 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Share openh264 configuration across configurations.

parent 0486e57a
......@@ -36,7 +36,7 @@ set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264")
set(EP_openh264_GIT_TAG "c13bfe6407252f64610b0c2c9aa0737054dcd71e")
set(EP_openh264_BUILD_METHOD "custom")
set(EP_openh264_BUILD_IN_SOURCE "yes")
set(EP_openh264_LINKING_TYPE "-shared")
set(EP_openh264_LINKING_TYPE "-static")
set(EP_openh264_BUILD_TYPE "Release") # Always use Release build type, otherwise the codec is too slow...
set(EP_openh264_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/permissive.patch")
set(EP_openh264_CONFIGURE_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/configure.sh.cmake)
......@@ -45,3 +45,10 @@ set(EP_openh264_INSTALL_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/open
if (MSVC)
set(EP_openh264_ADDITIONAL_OPTIONS "OS=\"msvc\"")
endif()
if (APPLE)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86_64\"")
else()
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86\"")
endif()
endif()
......@@ -110,16 +110,6 @@ endif()
# msopenh264
set(EP_msopenh264_LINKING_TYPE "-DENABLE_STATIC=YES")
# openh264
set(EP_openh264_LINKING_TYPE "-static")
if (APPLE)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86_64\"")
else()
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86\"")
endif()
endif()
# opus
if(NOT MSVC)
# TODO: Also build statically on windows
......
......@@ -97,16 +97,6 @@ endif()
# opencoreamr
set(EP_opencoreamr_LINKING_TYPE "--enable-static" "--disable-shared" "--with-pic")
# openh264
set(EP_openh264_LINKING_TYPE "-static")
if (APPLE)
if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86_64\"")
else()
set(EP_openh264_ADDITIONAL_OPTIONS "ARCH=\"x86\"")
endif()
endif()
# opus
if(NOT MSVC)
# TODO: Also build statically on windows
......
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