From 9737292aca90d44e7a0152dc6022f0bb9da41b4d Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 3 Sep 2020 23:50:17 +0200 Subject: [PATCH] Use correct target instead --- images/base-win64/Dockerfile | 2 +- variants/gpl-4.2.sh | 2 +- variants/gpl.sh | 2 +- variants/lgpl-4.2.sh | 2 +- variants/lgpl.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile index 0eb6950..292dbde 100644 --- a/images/base-win64/Dockerfile +++ b/images/base-win64/Dockerfile @@ -11,7 +11,7 @@ RUN \ ADD toolchain.cmake /toolchain.cmake -ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=win32" \ +ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw64" \ FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \ FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \ FFBUILD_PREFIX=/opt/ffbuild \ diff --git a/variants/gpl-4.2.sh b/variants/gpl-4.2.sh index 6fc798d..3fea1ec 100644 --- a/variants/gpl-4.2.sh +++ b/variants/gpl-4.2.sh @@ -1,5 +1,5 @@ FF_CONFIGURE="--enable-gpl --enable-version3" FF_CFLAGS="-static-libgcc -static-libstdc++" FF_CXXFLAGS="-static-libgcc -static-libstdc++" -FF_LDFLAGS="-static-libgcc -static-libstdc++ -mconsole" +FF_LDFLAGS="-static-libgcc -static-libstdc++" GIT_BRANCH="release/4.2" diff --git a/variants/gpl.sh b/variants/gpl.sh index ca7e934..4d34740 100644 --- a/variants/gpl.sh +++ b/variants/gpl.sh @@ -1,5 +1,5 @@ FF_CONFIGURE="--enable-gpl --enable-version3" FF_CFLAGS="-static-libgcc -static-libstdc++" FF_CXXFLAGS="-static-libgcc -static-libstdc++" -FF_LDFLAGS="-static-libgcc -static-libstdc++ -mconsole" +FF_LDFLAGS="-static-libgcc -static-libstdc++" GIT_BRANCH="master" diff --git a/variants/lgpl-4.2.sh b/variants/lgpl-4.2.sh index e2eccf7..ba8600e 100644 --- a/variants/lgpl-4.2.sh +++ b/variants/lgpl-4.2.sh @@ -1,5 +1,5 @@ FF_CONFIGURE="--enable-version3" FF_CFLAGS="-static-libgcc -static-libstdc++" FF_CXXFLAGS="-static-libgcc -static-libstdc++" -FF_LDFLAGS="-static-libgcc -static-libstdc++ -mconsole" +FF_LDFLAGS="-static-libgcc -static-libstdc++" GIT_BRANCH="release/4.2" diff --git a/variants/lgpl.sh b/variants/lgpl.sh index 3b5c4f4..89fe7ef 100644 --- a/variants/lgpl.sh +++ b/variants/lgpl.sh @@ -1,5 +1,5 @@ FF_CONFIGURE="--enable-version3" FF_CFLAGS="-static-libgcc -static-libstdc++" FF_CXXFLAGS="-static-libgcc -static-libstdc++" -FF_LDFLAGS="-static-libgcc -static-libstdc++ -mconsole" +FF_LDFLAGS="-static-libgcc -static-libstdc++" GIT_BRANCH="master"