From 8e08ae7e762281a900493bbe88ef1d88c963044e Mon Sep 17 00:00:00 2001 From: pikokr Date: Thu, 4 May 2023 17:48:53 +0900 Subject: [PATCH] fix: build issue --- build-current.sh | 2 +- build-docker.sh | 0 build-win.sh | 5 +++++ scripts/build-ffmpeg.sh | 4 +--- 4 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 build-current.sh create mode 100644 build-docker.sh create mode 100755 build-win.sh diff --git a/build-current.sh b/build-current.sh old mode 100644 new mode 100755 index 6edfb13..069559c --- a/build-current.sh +++ b/build-current.sh @@ -1,3 +1,3 @@ export OPENH264_OS=$(uname | tr A-Z a-z | tr -d \\-0-9. | sed -E 's/^(net|open|free)bsd/bsd/') -CC=gcc CXX=g++ AR=ar bash build.sh +CC=gcc CXX=g++ AR=ar bash build.sh $@ diff --git a/build-docker.sh b/build-docker.sh new file mode 100644 index 0000000..e69de29 diff --git a/build-win.sh b/build-win.sh new file mode 100755 index 0000000..b7a5aa9 --- /dev/null +++ b/build-win.sh @@ -0,0 +1,5 @@ +set -x + +export TOOLCHAIN=x86_64-w64-mingw32 + +OPENH264_OS=mingw_nt OPENH264_ARCH=x86_64 CC=$TOOLCHAIN-gcc CXX=$TOOLCHAIN-g++ AR=$TOOLCHAIN-ar bash build.sh \ No newline at end of file diff --git a/scripts/build-ffmpeg.sh b/scripts/build-ffmpeg.sh index bf2413a..f2d542e 100644 --- a/scripts/build-ffmpeg.sh +++ b/scripts/build-ffmpeg.sh @@ -14,7 +14,7 @@ make distclean flags="--cc=$CC --cxx=$CXX" -if [[ -z $FFMPEG_MSVC ]]; then +if [[ $FFMPEG_MSVC == 1 ]]; then flags="--toolchain=msvc" fi @@ -23,8 +23,6 @@ fi --enable-libopenh264 \ --prefix=$PREFIX --enable-cross-compile --arch=$ARCH \ --pkg-config-flags="--static" --target-os=$FFMPEG_OS \ - --extra-ldflags="-libpath:$PREFIX/lib" \ - --extra-cflags="-I$PREFIX/include/mfx" \ ${flags} ${FFBUILD_FLAGS} make -j$JOBS