Commit e36440cc authored by Ghislain MARY's avatar Ghislain MARY

Build version 1.3.1 of openh264.

parent 3add4c40
......@@ -33,7 +33,7 @@ if(NOT NASM_PROGRAM)
endif()
set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264")
set(EP_openh264_GIT_TAG "3a75956fb2584cca84a95ba1fcbc72fa2c91f98d")
set(EP_openh264_GIT_TAG "v1.3.1")
set(EP_openh264_BUILD_METHOD "custom")
set(EP_openh264_BUILD_IN_SOURCE "yes")
set(EP_openh264_LINKING_TYPE "-static")
......
......@@ -21,4 +21,6 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@
make install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
make install@EP_openh264_LINKING_TYPE@ PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
# Use following line to build version 1.4
#make install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
......@@ -23,3 +23,6 @@
if(EXISTS ${INSTALL_PREFIX}/lib/libopenh264.a)
execute_process(COMMAND "ranlib" "${INSTALL_PREFIX}/lib/libopenh264.a")
endif()
if(EXISTS ${INSTALL_PREFIX}/bin/openh264.dll)
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${SOURCE_DIR}/cmake/importlib.py" "${INSTALL_PREFIX}/bin/openh264.dll" "${INSTALL_PREFIX}/lib/openh264.lib")
endif()
......@@ -95,8 +95,6 @@ if(WIN32)
endif()
# openh264
# Use version 1.3.1 to use the binary release from Cisco
set(EP_openh264_GIT_TAG "v1.3.1")
set(EP_openh264_LINKING_TYPE "-shared")
# vpx
......
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