diff --git a/images/base-win64/Dockerfile b/images/base-win64/Dockerfile index 292dbde..8a47204 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=mingw64" \ +ENV FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32" \ 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 3fea1ec..0a98192 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++" +FF_CFLAGS="" +FF_CXXFLAGS="" +FF_LDFLAGS="" GIT_BRANCH="release/4.2" diff --git a/variants/gpl.sh b/variants/gpl.sh index 4d34740..f672c41 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++" +FF_CFLAGS="" +FF_CXXFLAGS="" +FF_LDFLAGS="" GIT_BRANCH="master" diff --git a/variants/lgpl-4.2.sh b/variants/lgpl-4.2.sh index ba8600e..7c2295d 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++" +FF_CFLAGS="" +FF_CXXFLAGS="" +FF_LDFLAGS="" GIT_BRANCH="release/4.2" diff --git a/variants/lgpl.sh b/variants/lgpl.sh index 89fe7ef..0d119cc 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++" +FF_CFLAGS="" +FF_CXXFLAGS="" +FF_LDFLAGS="" GIT_BRANCH="master"