build-current.sh

@@ -1,3 +0,0 @@
-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

build-win32.sh

@@ -1,3 +0,0 @@
-TOOLCHAIN=i686-w64-mingw32
-
-FFMPEG_OS=win32 FFMPEG_MSBUILD=1 OPENH264_ARCH=i686 OPENH264_OS=msvc CC=cl CXX=cl AR=lib bash build.sh --arch i686

build-win64.sh

@@ -1,3 +1,3 @@
 TOOLCHAIN=x86_64-w64-mingw32
 
-FFMPEG_OS=win64 FFMPEG_MSBUILD=1 OPENH264_ARCH=x86_64 OPENH264_OS=msvc CC=cl CXX=cl AR=lib bash build.sh --arch x86_64
+FFMPEG_OS=win64 OPENH264_ARCH=x86_64 OPENH264_OS=mingw_nt CC=$TOOLCHAIN-gcc CXX=$TOOLCHAIN-g++ AR=$TOOLCHAIN-ar bash build.sh --arch x86_64

build.sh

@@ -1,6 +1,5 @@
 export ARCH=$(uname -m)
-# do not use all cpus because my computer dies
+export JOBS=$(awk -v count=$(nproc) 'BEGIN { print ( int( count / 2 ) ) }')
-export JOBS=$(awk -v count=$(nproc) 'BEGIN { print ( int( count - 1 ) ) }')
 
 while [[ $# -gt 0 ]]; do
   case $1 in

scripts/build-ffmpeg.sh

@@ -1,23 +1,17 @@
 export ffmpegPath=$workDir/ffmpeg
 
-git clone https://github.com/FFmpeg/FFmpeg -b release/6.0 $ffmpegPath --depth 1
+git clone https://github.com/FFmpeg/FFmpeg $ffmpegPath --depth 1
 
 cd $ffmpegPath
 
 make distclean
 
-flags="--cc=$CC --cxx=$CXX"
-
-if [[ -z $FFMPEG_MSVC ]]; then
-  flags="--toolchain=msvc"
-fi
-
 ./configure --disable-gpl --disable-nonfree --disable-doc --disable-network \
   --disable-ffprobe --disable-ffplay --enable-static --disable-shared \
   --enable-libopenh264 \
   --prefix=$PREFIX --enable-cross-compile --arch=$ARCH \
-  --pkg-config-flags="--static" --target-os=$FFMPEG_OS \
+  --cc="$CC" --cxx="$CXX" \
-  ${flags}
+  --pkg-config-flags="--static" --target-os=$FFMPEG_OS
 
 make -j$JOBS