From fc43473291f0f605026d04ad158842ca79c8a0d4 Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Thu, 7 May 2026 20:22:26 +0300
Subject: [PATCH] add WIN_<BITS>_OR_NULL env to windows

---
 windows-base-env32/Dockerfile |  2 ++
 windows-base-env64/Dockerfile |  2 ++
 windows/Dockerfile            | 10 +++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/windows-base-env32/Dockerfile b/windows-base-env32/Dockerfile
index fd26938..7d44131 100644
--- a/windows-base-env32/Dockerfile
+++ b/windows-base-env32/Dockerfile
@@ -2,6 +2,8 @@ ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}windows-base
 
 ENV WIN_BITS=32
+ENV WIN_32_OR_NULL=32
+ENV WIN_64_OR_NULL=
 ENV WIN_ARCH=i686
 ENV WIN_ARCH2=x86
 ENV SODIUM_M_ARG=
diff --git a/windows-base-env64/Dockerfile b/windows-base-env64/Dockerfile
index f015661..22d051a 100644
--- a/windows-base-env64/Dockerfile
+++ b/windows-base-env64/Dockerfile
@@ -2,6 +2,8 @@ ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}windows-base
 
 ENV WIN_BITS=64
+ENV WIN_32_OR_NULL=
+ENV WIN_64_OR_NULL=64
 ENV WIN_ARCH=x86_64
 ENV WIN_ARCH2=x86_64
 ENV SODIUM_M_ARG=-m64
diff --git a/windows/Dockerfile b/windows/Dockerfile
index 296a7b8..85c9ee9 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -48,7 +48,7 @@ RUN unzip -o /soft/postgresql_x${WIN_BITS}.zip -d ${SYSROOT}/ \
 
 # microhttpd
 RUN mkdir -p /soft/tmp && cd /soft/tmp \
- && wget https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip \
+ && wget -nv https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip \
  && unzip -o /soft/tmp/*.zip -d /soft/tmp \
  && cp -rfv /soft/tmp/libmicrohttpd-*-w32-bin/${WIN_ARCH2}/MinGW/static/mingw${WIN_BITS}/* ${INSTALL_DIR}/ \
  && rm -rf /soft/tmp
@@ -80,7 +80,7 @@ RUN curl -s https://download.libsodium.org/libsodium/releases/libsodium-${CUR_SO
 
 # fftw3
 WORKDIR /soft
-RUN wget -v http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
+RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
  && tar -xf fftw-${CUR_FFTW_VERSION}.tar.gz -C /soft \
  && rm -f fftw-${CUR_FFTW_VERSION}.tar.gz \
  && cd /soft/fftw-* && patch < /soft/fftw.cmake.patch \
@@ -109,7 +109,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
 # markdown
 RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount
 WORKDIR /soft
-RUN wget -v https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
+RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
  && tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
  && rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
 RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
@@ -138,7 +138,7 @@ RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VE
  && rm -f OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
  && mkdir -p ${INSTALL_DIR}/build/openssl && cd ${INSTALL_DIR}/build/openssl \
  && /soft/openssl-OpenSSL_${CUR_OPENSSL_VERSION}/Configure --cross-compile-prefix=${WIN_TRIPPLET}- \
-	--prefix=${INSTALL_DIR}/ --release no-idea no-mdc2 no-rc5 no-tests shared mingw \
+	--prefix=${INSTALL_DIR}/ --release no-idea no-mdc2 no-rc5 no-tests shared mingw${WIN_64_OR_NULL} \
  && make -j${JOBS_COUNT} && make install \
  && cd /soft && rm -rf ${INSTALL_DIR}/build/openssl && rm -rf /soft/openssl-OpenSSL_*
 
@@ -146,7 +146,7 @@ RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VE
 # Qt
 ENV QT_SRC=/soft/qt-everywhere-src-${CUR_QT_VERSION}
 WORKDIR /soft
-RUN wget -v https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
+RUN wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
  && tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
  && rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
  && cd ${QT_SRC}/qtdeclarative/src/plugins/scenegraph/d3d12 \