Commit b94f3ae7 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Update openh264 to version 1.5.0.

parent bc05369e
......@@ -33,7 +33,7 @@ if(NOT NASM_PROGRAM)
endif()
set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264" CACHE STRING "openh264 repository URL")
set(EP_openh264_GIT_TAG "v1.4.0" CACHE STRING "openh264 tag to use")
set(EP_openh264_GIT_TAG "v1.5.0" CACHE STRING "openh264 tag to use")
set(EP_openh264_EXTERNAL_SOURCE_PATHS "externals/openh264")
set(EP_openh264_BUILD_METHOD "custom")
......@@ -42,7 +42,6 @@ set(EP_openh264_BUILD_TYPE "Release") # Always use Release build type, otherwise
set(EP_openh264_CONFIGURE_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/configure.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_OUT_OF_TREE_BUILD_PATCH "${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/out-of-tree-build.patch")
if (MSVC)
set(EP_openh264_ADDITIONAL_OPTIONS "OS=\"msvc\"")
endif()
......
......@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@
make -f @ep_source@/Makefile libraries PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" ASM="@NASM_PROGRAM@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
make -f @ep_source_relative_to_build@/Makefile libraries PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" ASM="@NASM_PROGRAM@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
#!/bin/sh
cd @ep_source@
if [ ! -f .out-of-tree-build-patch-applied ]; then
patch -p1 -i @EP_openh264_OUT_OF_TREE_BUILD_PATCH@ && touch .out-of-tree-build-patch-applied
fi
......@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@
make -f @ep_source@/Makefile install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
make -f @ep_source_relative_to_build@/Makefile install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
--- openh264.orig/Makefile 2015-05-25 14:28:18.000000000 +0200
+++ openh264/Makefile 2015-05-25 14:28:06.000000000 +0200
@@ -228,15 +228,15 @@
$(QUIET)ln -sfn $+ $@
endif
-$(PROJECT_NAME).pc: $(PROJECT_NAME).pc.in
- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $(PROJECT_NAME).pc.in > $@
+$(PROJECT_NAME).pc: $(SRC_PATH)/$(PROJECT_NAME).pc.in
+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;;' -e 's;@LIBS_PRIVATE@;$(STATIC_LDFLAGS);' < $< > $@
-$(PROJECT_NAME)-static.pc: $(PROJECT_NAME).pc.in
- @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $(PROJECT_NAME).pc.in > $@
+$(PROJECT_NAME)-static.pc: $(SRC_PATH)/$(PROJECT_NAME).pc.in
+ @sed -e 's;@prefix@;$(PREFIX);' -e 's;@VERSION@;$(VERSION);' -e 's;@LIBS@;$(STATIC_LDFLAGS);' -e 's;@LIBS_PRIVATE@;;' < $< > $@
install-headers:
mkdir -p $(DESTDIR)/$(PREFIX)/include/wels
- install -m 644 codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
+ install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)/$(PREFIX)/include/wels
install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers
mkdir -p $(DESTDIR)/$(PREFIX)/lib
diff -urN openh264-bc.orig/build/gtest-targets.mk openh264-bc/build/gtest-targets.mk
--- openh264-bc.orig/build/gtest-targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/build/gtest-targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -6,7 +6,7 @@
OBJS += $(GTEST_OBJS)
-$(GTEST_SRCDIR)/%.$(OBJ): $(GTEST_SRCDIR)/%.cc
+$(GTEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(GTEST_SRCDIR)/%.cc
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(GTEST_CFLAGS) $(GTEST_INCLUDES) -c $(CXX_O) $<
$(LIBPREFIX)gtest.$(LIBSUFFIX): $(GTEST_OBJS)
diff -urN openh264-bc.orig/build/msvc-common.mk openh264-bc/build/msvc-common.mk
--- openh264-bc.orig/build/msvc-common.mk 2015-05-28 14:51:28.332927681 +0200
+++ openh264-bc/build/msvc-common.mk 2015-05-28 14:49:47.276262858 +0200
@@ -40,6 +40,6 @@
SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
SHARED=-LD
EXTRA_LIBRARY=$(PROJECT_NAME)_dll.lib
-SHLDFLAGS=-Fd$(PROJECT_NAME).pdb -link -def:openh264.def -implib:$(EXTRA_LIBRARY)
+SHLDFLAGS=-Fd$(PROJECT_NAME).pdb -link -def:$(SRC_PATH)/openh264.def -implib:$(EXTRA_LIBRARY)
STATIC_LDFLAGS=
CODEC_UNITTEST_CFLAGS=-D_CRT_SECURE_NO_WARNINGS
diff -urN openh264-bc.orig/codec/common/generate_version.sh openh264-bc/codec/common/generate_version.sh
--- openh264-bc.orig/codec/common/generate_version.sh 2015-05-28 10:43:37.193198643 +0200
+++ openh264-bc/codec/common/generate_version.sh 2015-05-28 14:48:40.782930735 +0200
@@ -1,4 +1,5 @@
#!/bin/bash
+SRC_PATH=$1
git rev-list HEAD | sort > config.git-hash
LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
if [ $LOCALVER \> 1 ] ; then
@@ -14,7 +15,8 @@
GIT_VERSION='"'$GIT_VERSION'"'
rm -f config.git-hash
-cat codec/common/inc/version_gen.h.template | sed "s/\$FULL_VERSION/$GIT_VERSION/g" > codec/common/inc/version_gen.h.new
+mkdir -p codec/common/inc
+cat $SRC_PATH/codec/common/inc/version_gen.h.template | sed "s/\$FULL_VERSION/$GIT_VERSION/g" > codec/common/inc/version_gen.h.new
if cmp codec/common/inc/version_gen.h.new codec/common/inc/version_gen.h > /dev/null 2>&1; then
# Identical to old version, don't touch it (to avoid unnecessary rebuilds)
rm codec/common/inc/version_gen.h.new
diff -urN openh264-bc.orig/codec/common/targets.mk openh264-bc/codec/common/targets.mk
--- openh264-bc.orig/codec/common/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/common/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -61,13 +61,13 @@
OBJS += $(COMMON_OBJS)
-$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.cpp
+$(COMMON_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(COMMON_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<
-$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.asm
+$(COMMON_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(COMMON_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(COMMON_ASMFLAGS) $(COMMON_ASM_INCLUDES) -o $@ $<
-$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.S
+$(COMMON_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(COMMON_SRCDIR)/%.S
$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c -o $@ $<
$(LIBPREFIX)common.$(LIBSUFFIX): $(COMMON_OBJS)
diff -urN openh264-bc.orig/codec/console/common/targets.mk openh264-bc/codec/console/common/targets.mk
--- openh264-bc.orig/codec/console/common/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/console/common/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -6,7 +6,7 @@
OBJS += $(CONSOLE_COMMON_OBJS)
-$(CONSOLE_COMMON_SRCDIR)/%.$(OBJ): $(CONSOLE_COMMON_SRCDIR)/%.cpp
+$(CONSOLE_COMMON_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(CONSOLE_COMMON_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(CONSOLE_COMMON_CFLAGS) $(CONSOLE_COMMON_INCLUDES) -c $(CXX_O) $<
$(LIBPREFIX)console_common.$(LIBSUFFIX): $(CONSOLE_COMMON_OBJS)
diff -urN openh264-bc.orig/codec/console/dec/targets.mk openh264-bc/codec/console/dec/targets.mk
--- openh264-bc.orig/codec/console/dec/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/console/dec/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -7,7 +7,7 @@
OBJS += $(H264DEC_OBJS)
-$(H264DEC_SRCDIR)/%.$(OBJ): $(H264DEC_SRCDIR)/%.cpp
+$(H264DEC_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(H264DEC_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264DEC_CFLAGS) $(H264DEC_INCLUDES) -c $(CXX_O) $<
h264dec$(EXEEXT): $(H264DEC_OBJS) $(H264DEC_DEPS)
diff -urN openh264-bc.orig/codec/console/enc/targets.mk openh264-bc/codec/console/enc/targets.mk
--- openh264-bc.orig/codec/console/enc/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/console/enc/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -6,7 +6,7 @@
OBJS += $(H264ENC_OBJS)
-$(H264ENC_SRCDIR)/%.$(OBJ): $(H264ENC_SRCDIR)/%.cpp
+$(H264ENC_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(H264ENC_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264ENC_CFLAGS) $(H264ENC_INCLUDES) -c $(CXX_O) $<
h264enc$(EXEEXT): $(H264ENC_OBJS) $(H264ENC_DEPS)
diff -urN openh264-bc.orig/codec/decoder/targets.mk openh264-bc/codec/decoder/targets.mk
--- openh264-bc.orig/codec/decoder/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/decoder/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -55,13 +55,13 @@
OBJS += $(DECODER_OBJS)
-$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.cpp
+$(DECODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(DECODER_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(DECODER_CFLAGS) $(DECODER_INCLUDES) -c $(CXX_O) $<
-$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.asm
+$(DECODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(DECODER_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(DECODER_ASMFLAGS) $(DECODER_ASM_INCLUDES) -o $@ $<
-$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.S
+$(DECODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(DECODER_SRCDIR)/%.S
$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(DECODER_CFLAGS) $(DECODER_INCLUDES) -c -o $@ $<
$(LIBPREFIX)decoder.$(LIBSUFFIX): $(DECODER_OBJS)
diff -urN openh264-bc.orig/codec/encoder/targets.mk openh264-bc/codec/encoder/targets.mk
--- openh264-bc.orig/codec/encoder/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/encoder/targets.mk 2015-05-28 14:48:40.782930735 +0200
@@ -78,13 +78,13 @@
OBJS += $(ENCODER_OBJS)
-$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.cpp
+$(ENCODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(ENCODER_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c $(CXX_O) $<
-$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.asm
+$(ENCODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(ENCODER_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(ENCODER_ASMFLAGS) $(ENCODER_ASM_INCLUDES) -o $@ $<
-$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.S
+$(ENCODER_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(ENCODER_SRCDIR)/%.S
$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c -o $@ $<
$(LIBPREFIX)encoder.$(LIBSUFFIX): $(ENCODER_OBJS)
diff -urN openh264-bc.orig/codec/processing/targets.mk openh264-bc/codec/processing/targets.mk
--- openh264-bc.orig/codec/processing/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/codec/processing/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -57,13 +57,13 @@
OBJS += $(PROCESSING_OBJS)
-$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.cpp
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(PROCESSING_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<
-$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.asm
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(PROCESSING_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<
-$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.S
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(PROCESSING_SRCDIR)/%.S
$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c -o $@ $<
$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)
diff -urN openh264-bc.orig/Makefile openh264-bc/Makefile
--- openh264-bc.orig/Makefile 2015-05-28 14:51:28.332927681 +0200
+++ openh264-bc/Makefile 2015-05-28 14:48:40.792930735 +0200
@@ -80,7 +80,7 @@
endif
-INCLUDES += -I$(SRC_PATH)codec/api/svc -I$(SRC_PATH)codec/common/inc
+INCLUDES += -I$(SRC_PATH)codec/api/svc -I$(SRC_PATH)codec/common/inc -Icodec/common/inc
DECODER_INCLUDES += \
-I$(SRC_PATH)codec/decoder/core/inc \
@@ -139,7 +139,7 @@
all: libraries binaries
generate-version:
- $(QUIET)cd $(SRC_PATH) && sh ./codec/common/generate_version.sh
+ $(QUIET)sh $(SRC_PATH)/codec/common/generate_version.sh $(SRC_PATH)
codec/decoder/plus/src/welsDecoderExt.$(OBJ): | generate-version
codec/encoder/plus/src/welsEncoderExt.$(OBJ): | generate-version
diff -urN openh264-bc.orig/module/targets.mk openh264-bc/module/targets.mk
--- openh264-bc.orig/module/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/module/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -6,6 +6,6 @@
OBJS += $(MODULE_OBJS)
-$(MODULE_SRCDIR)/%.$(OBJ): $(MODULE_SRCDIR)/%.cpp
+$(MODULE_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(MODULE_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(MODULE_CFLAGS) $(MODULE_INCLUDES) -c $(CXX_O) $<
diff -urN openh264-bc.orig/test/api/targets.mk openh264-bc/test/api/targets.mk
--- openh264-bc.orig/test/api/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/test/api/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -19,9 +19,9 @@
API_TEST_OBJS += $(API_TEST_C_SRCS:.c=.$(OBJ))
OBJS += $(API_TEST_OBJS)
-$(API_TEST_SRCDIR)/%.$(OBJ): $(API_TEST_SRCDIR)/%.cpp
+$(API_TEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(API_TEST_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(API_TEST_CFLAGS) $(API_TEST_INCLUDES) -c $(CXX_O) $<
-$(API_TEST_SRCDIR)/%.$(OBJ): $(API_TEST_SRCDIR)/%.c
+$(API_TEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(API_TEST_SRCDIR)/%.c
$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(API_TEST_CFLAGS) $(API_TEST_INCLUDES) -c $(CXX_O) $<
diff -urN openh264-bc.orig/test/common/targets.mk openh264-bc/test/common/targets.mk
--- openh264-bc.orig/test/common/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/test/common/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -6,6 +6,6 @@
OBJS += $(COMMON_UNITTEST_OBJS)
-$(COMMON_UNITTEST_SRCDIR)/%.$(OBJ): $(COMMON_UNITTEST_SRCDIR)/%.cpp
+$(COMMON_UNITTEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(COMMON_UNITTEST_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(COMMON_UNITTEST_CFLAGS) $(COMMON_UNITTEST_INCLUDES) -c $(CXX_O) $<
diff -urN openh264-bc.orig/test/decoder/targets.mk openh264-bc/test/decoder/targets.mk
--- openh264-bc.orig/test/decoder/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/test/decoder/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -13,6 +13,6 @@
OBJS += $(DECODER_UNITTEST_OBJS)
-$(DECODER_UNITTEST_SRCDIR)/%.$(OBJ): $(DECODER_UNITTEST_SRCDIR)/%.cpp
+$(DECODER_UNITTEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(DECODER_UNITTEST_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(DECODER_UNITTEST_CFLAGS) $(DECODER_UNITTEST_INCLUDES) -c $(CXX_O) $<
diff -urN openh264-bc.orig/test/encoder/targets.mk openh264-bc/test/encoder/targets.mk
--- openh264-bc.orig/test/encoder/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/test/encoder/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -21,6 +21,6 @@
OBJS += $(ENCODER_UNITTEST_OBJS)
-$(ENCODER_UNITTEST_SRCDIR)/%.$(OBJ): $(ENCODER_UNITTEST_SRCDIR)/%.cpp
+$(ENCODER_UNITTEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(ENCODER_UNITTEST_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(ENCODER_UNITTEST_CFLAGS) $(ENCODER_UNITTEST_INCLUDES) -c $(CXX_O) $<
diff -urN openh264-bc.orig/test/processing/targets.mk openh264-bc/test/processing/targets.mk
--- openh264-bc.orig/test/processing/targets.mk 2015-05-28 10:44:25.139864435 +0200
+++ openh264-bc/test/processing/targets.mk 2015-05-28 14:48:40.786264067 +0200
@@ -9,6 +9,6 @@
OBJS += $(PROCESSING_UNITTEST_OBJS)
-$(PROCESSING_UNITTEST_SRCDIR)/%.$(OBJ): $(PROCESSING_UNITTEST_SRCDIR)/%.cpp
+$(PROCESSING_UNITTEST_SRCDIR)/%.$(OBJ): $(SRC_PATH)/$(PROCESSING_UNITTEST_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_UNITTEST_CFLAGS) $(PROCESSING_UNITTEST_INCLUDES) -c $(CXX_O) $<
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