diff --git a/internal/binding/templater/template_cgo_qmake.go b/internal/binding/templater/template_cgo_qmake.go index 8b8e5a77..181cc8c2 100644 --- a/internal/binding/templater/template_cgo_qmake.go +++ b/internal/binding/templater/template_cgo_qmake.go @@ -439,8 +439,8 @@ func createCgo(module, path, target string, mode int, ipkg, tags string) string fmt.Fprintf(bb, "#cgo LDFLAGS: -Wl,-syslibroot,%v/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/%v -mios-simulator-version-min=10.0\n", utils.XCODE_DIR(), utils.IPHONESIMULATOR_SDK_DIR()) } - fmt.Fprintf(bb, "#cgo CFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n") - fmt.Fprintf(bb, "#cgo CXXFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n") + fmt.Fprint(bb, "#cgo CFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n") + fmt.Fprint(bb, "#cgo CXXFLAGS: -Wno-unused-parameter -Wno-unused-variable -Wno-return-type\n") fmt.Fprint(bb, "*/\nimport \"C\"\n") diff --git a/internal/docker/windows_32_shared/Dockerfile.base_7 b/internal/docker/windows_32_shared/Dockerfile.base_7 index 34aefc9b..c9ce6223 100644 --- a/internal/docker/windows_32_shared/Dockerfile.base_7 +++ b/internal/docker/windows_32_shared/Dockerfile.base_7 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_32_shared_base_6 as base -RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qt5 +RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' EXCLUDE_PKGS='qtwebkit' qt5 RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg diff --git a/internal/docker/windows_64_shared/Dockerfile.base_1 b/internal/docker/windows_64_shared/Dockerfile.base_1 index acb88b66..256dc1dc 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_1 +++ b/internal/docker/windows_64_shared/Dockerfile.base_1 @@ -4,4 +4,4 @@ LABEL maintainer therecipe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' gcc gettext openssl glib lzo +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' gcc gettext openssl glib lzo diff --git a/internal/docker/windows_64_shared/Dockerfile.base_2 b/internal/docker/windows_64_shared/Dockerfile.base_2 index d7698829..0f7413e5 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_2 +++ b/internal/docker/windows_64_shared/Dockerfile.base_2 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_1 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite diff --git a/internal/docker/windows_64_shared/Dockerfile.base_3 b/internal/docker/windows_64_shared/Dockerfile.base_3 index d17d362e..46a09dcd 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_3 +++ b/internal/docker/windows_64_shared/Dockerfile.base_3 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_2 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtbase +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtbase diff --git a/internal/docker/windows_64_shared/Dockerfile.base_4 b/internal/docker/windows_64_shared/Dockerfile.base_4 index 421af972..f60f18a9 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_4 +++ b/internal/docker/windows_64_shared/Dockerfile.base_4 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_3 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtdeclarative +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtdeclarative diff --git a/internal/docker/windows_64_shared/Dockerfile.base_5 b/internal/docker/windows_64_shared/Dockerfile.base_5 index 84410a7e..5fcee764 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_5 +++ b/internal/docker/windows_64_shared/Dockerfile.base_5 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_4 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qt3d +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qt3d diff --git a/internal/docker/windows_64_shared/Dockerfile.base_6 b/internal/docker/windows_64_shared/Dockerfile.base_6 index 85997c8d..fee0406b 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_6 +++ b/internal/docker/windows_64_shared/Dockerfile.base_6 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_5 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation diff --git a/internal/docker/windows_64_shared/Dockerfile.base_7 b/internal/docker/windows_64_shared/Dockerfile.base_7 index ffed24be..0ae076df 100644 --- a/internal/docker/windows_64_shared/Dockerfile.base_7 +++ b/internal/docker/windows_64_shared/Dockerfile.base_7 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_shared_base_6 as base -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.shared' qt5 +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' EXCLUDE_PKGS='qtwebkit' qt5 RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg diff --git a/internal/docker/windows_64_static/Dockerfile.base_1 b/internal/docker/windows_64_static/Dockerfile.base_1 index 47106d77..ad002323 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_1 +++ b/internal/docker/windows_64_static/Dockerfile.base_1 @@ -4,4 +4,4 @@ LABEL maintainer therecipe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' gcc gettext openssl glib lzo +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' gcc gettext openssl glib lzo diff --git a/internal/docker/windows_64_static/Dockerfile.base_2 b/internal/docker/windows_64_static/Dockerfile.base_2 index 9aada2c8..a7912148 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_2 +++ b/internal/docker/windows_64_static/Dockerfile.base_2 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_1 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite diff --git a/internal/docker/windows_64_static/Dockerfile.base_3 b/internal/docker/windows_64_static/Dockerfile.base_3 index ed9790a3..60d38cbf 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_3 +++ b/internal/docker/windows_64_static/Dockerfile.base_3 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_2 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtbase +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtbase diff --git a/internal/docker/windows_64_static/Dockerfile.base_4 b/internal/docker/windows_64_static/Dockerfile.base_4 index 9965b97a..f1c00df8 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_4 +++ b/internal/docker/windows_64_static/Dockerfile.base_4 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_3 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtdeclarative +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtdeclarative diff --git a/internal/docker/windows_64_static/Dockerfile.base_5 b/internal/docker/windows_64_static/Dockerfile.base_5 index ebddd97b..5bdc1673 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_5 +++ b/internal/docker/windows_64_static/Dockerfile.base_5 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_4 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qt3d +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt3d diff --git a/internal/docker/windows_64_static/Dockerfile.base_6 b/internal/docker/windows_64_static/Dockerfile.base_6 index e0624411..f59b15b4 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_6 +++ b/internal/docker/windows_64_static/Dockerfile.base_6 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_5 LABEL maintainer therecipe -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation diff --git a/internal/docker/windows_64_static/Dockerfile.base_7 b/internal/docker/windows_64_static/Dockerfile.base_7 index e0c13cc3..686e108a 100644 --- a/internal/docker/windows_64_static/Dockerfile.base_7 +++ b/internal/docker/windows_64_static/Dockerfile.base_7 @@ -1,4 +1,4 @@ FROM therecipe/qt:windows_64_static_base_6 as base -RUN cd /usr/lib/mxe && make MXE_TARGETS='x86-64-w64-mingw32.static' qt5 +RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt5 RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg