Skip to content

GitLab

Commit 49af46c0 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build of openh264 on platforms other than Windows.

parent f7764891
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
builders/openh264.cmake
View file @ 49af46c0
...@@ -42,5 +42,5 @@ set(EP_openh264_CONFIGURE_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/op ...@@ -42,5 +42,5 @@ set(EP_openh264_CONFIGURE_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/op
set(EP_openh264_BUILD_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/build.sh.cmake) set(EP_openh264_BUILD_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/build.sh.cmake)
set(EP_openh264_INSTALL_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/install.sh.cmake) set(EP_openh264_INSTALL_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/install.sh.cmake)
if (MSVC) if (MSVC)
set(EP_openh264_OS "msvc") set(EP_openh264_ADDITIONAL_OPTIONS "OS=\"msvc\"")
endif() endif()
builders/openh264/build.sh.cmake
View file @ 49af46c0
...@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@" ...@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@" export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@ cd @ep_build@
make PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" OS="@EP_openh264_OS@" make PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@
builders/openh264/install.sh.cmake
View file @ 49af46c0
...@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@" ...@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@" export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@ cd @ep_build@
make install@EP_openh264_LINKING_TYPE@ PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" OS="@EP_openh264_OS@" make install@EP_openh264_LINKING_TYPE@ PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@
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