Windows build

Author: slipher

CMakeLists.txt

@@ -5,6 +5,9 @@ project(updater LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# triggers in QML generated files
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
+
 # important for quazip
 set(BUILD_SHARED_LIBS OFF)
 
@@ -18,6 +21,11 @@ find_package(Qt6 REQUIRED COMPONENTS Core Qml Quick QuickControls2 QuickDialogs2
 # Actually only used by Fluid and Quazip, not us. HACK: prevent warning spam
 find_package(Qt6 COMPONENTS Core5Compat)
 
+if (WIN32)
+    set(CMAKE_C_FLAGS "-static -static-libgcc ${CMAKE_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-static -static-libgcc ${CMAKE_CXX_FLAGS}")
+endif()
+
 qt_standard_project_setup(REQUIRES 6.8)
 
 option(FLUID_WITH_GALLERY "" OFF)
@@ -28,6 +36,9 @@ add_subdirectory(fluid)
 set(QUAZIP_BZIP2 OFF)
 set(QUAZIP_ENABLE_TESTS OFF)
 set(QUAZIP_FETCH_LIBS OFF)
+if (WIN32)
+   set(QUAZIP_USE_QT_ZLIB ON)
+endif()
 add_subdirectory(quazip)
 
 set(SOURCES
@@ -61,7 +72,7 @@ else()
     list(APPEND SOURCES linux.cpp)
 endif()
 
-qt_add_executable(updater
+qt_add_executable(updater WIN32
     ${SOURCES}
     qml.qrc
 )

Dockerfile

@@ -72,7 +72,7 @@ COPY md5sums-qt.txt build-qt.sh qtbase.patch /build-qt/
 ARG release
 # Note: {foo:+bar} here is a syntax of the Dockerfile, not the shell!
 ENV IPO_ARG=${release:+-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON}
-RUN BUILDQT_CMAKE_ARGS="${IPO_ARG} -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DFEATURE_reduce_relocations=OFF" CXXFLAGS='-fno-pic -no-pie' CFLAGS='-fno-pic -no-pie' PKG_CONFIG_PATH=/openssl/lib64/pkgconfig ./build-qt.sh && mv qt /qt && rm -rf /build-qt
+RUN BUILDQT_CMAKE_ARGS="${IPO_ARG} -DCMAKE_POSITION_INDEPENDENT_CODE=OFF -DFEATURE_reduce_relocations=OFF" CXXFLAGS='-fno-pic -no-pie' CFLAGS='-fno-pic -no-pie' PKG_CONFIG_PATH=/openssl/lib64/pkgconfig ./build-qt.sh linux && mv qt_linux /qt && rm -rf /build-qt
 
 ###############
 # Build aria2 #

Dockerfile.win

@@ -18,35 +18,37 @@ ENV LANG=C.UTF-8
 RUN apt-get update && apt-get install -y \
     autoconf \
     autopoint \
+    cmake \
     curl \
     gettext \
     g++ \
     g++-mingw-w64-i686-posix \
     git \
     libtool \
     make \
+    ninja-build \
     p7zip-full \
     pkg-config \
     python3 \
     xz-utils
 
-# The Schannel dependencies are spelled with capital letters which causes them not to be found
-RUN ln -s libsecur32.a /usr/i686-w64-mingw32/lib/libSecur32.a && \
-    ln -s libcrypt32.a /usr/i686-w64-mingw32/lib/libCrypt32.a
-
 ############
 # Build Qt #
 ############
 WORKDIR /build-qt
-COPY md5sums-qt.txt /build-qt/
-ENV UPDATER_MODULES=qtbase,qtquickcontrols,qtquickcontrols2,qtsvg,qtgraphicaleffects
-RUN curl -LO https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz && \
-    md5sum --check --ignore-missing md5sums-qt.txt && \
-    tar -xJf qt-everywhere-src-5.14.2.tar.xz && \
-    cd qt-everywhere-src-5.14.2 && \
-    ./configure -release -static -prefix /qt -qt-zlib -qt-libjpeg -qt-libpng -qt-freetype -qt-pcre -qt-harfbuzz -opengl desktop -opensource -confirm-license -no-qml-debug -no-icu -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32- -optimize-size --c++std=14 -nomake tests -nomake tools -nomake examples -schannel -no-feature-d3d12 && \
-    bash -c "make -j`nproc` module-{$UPDATER_MODULES} && make module-{$UPDATER_MODULES}-install_subtargets" && \
-    rm -rf /build-qt
+
+# Build host-mode tools and remove everything apart from the installed bin/ and lib/cmake/
+COPY md5sums-qt.txt build-qt.sh qtbase.patch cross-toolchain-mingw32.cmake /build-qt/
+RUN ./build-qt.sh tools qtbase qtdeclarative qtshadertools && \
+    rm -r build_tools && \
+    find qt_tools -mindepth 1 -maxdepth 1 ! -name bin ! -name lib ! -name libexec -exec rm -r {} + && \
+    find qt_tools/lib -mindepth 1 -maxdepth 1 ! -name cmake -exec rm -r {} +
+
+ARG release
+# Note: {foo:+bar} here is a syntax of the Dockerfile, not the shell!
+ENV IPO_ARG=${release:+-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON}
+RUN BUILDQT_CMAKE_ARGS="${IPO_ARG}"
+RUN ./build-qt.sh windows && rm -r build_windows
 
 ###############
 # Build aria2 #
@@ -64,7 +66,8 @@ RUN CFLAGS=-Os CXXFLAGS=-Os ../build-aria.sh ARIA2_STATIC=yes --host i686-w64-mi
 COPY . /updater
 RUN set -e; for D in . quazip fluid; do cd /updater/$D && git clean -dXff; done
 WORKDIR /build
-RUN /qt/bin/qmake -config release QMAKE_LFLAGS+="-static" INCLUDEPATH+=/qt/include/QtZlib /updater && make -j`nproc`
+RUN cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=/build-qt/cross-toolchain-mingw32.cmake -DCMAKE_FIND_ROOT_PATH=/build-qt/qt_windows -DCMAKE_BUILD_TYPE=MinSizeRel ${IPO_ARG} /updater && ninja
+RUN mv updater.exe updater-nonstripped.exe && i686-w64-mingw32-strip updater-nonstripped.exe -o updater.exe
 WORKDIR /release-win
 ARG release
-RUN if [ -n "$release" ]; then cp /build/release/updater.exe UnvanquishedUpdater.exe && 7z -tzip -mx=9 a UnvUpdaterWin.zip UnvanquishedUpdater.exe; fi
+RUN if [ -n "$release" ]; then cp /build/updater.exe UnvanquishedUpdater.exe && 7z -tzip -mx=9 a UnvUpdaterWin.zip UnvanquishedUpdater.exe; fi

README.md

@@ -47,7 +47,7 @@ The first line below runs the Docker build for Windows. The last 3 lines are to
 ```
 docker build -t unvlauncher-win -f Dockerfile.win .
 docker create --name unvlauncher-win unvlauncher-win
-docker cp unvlauncher-win:/build/release/updater.exe ./build-docker
+docker cp unvlauncher-win:/build/updater.exe ./build-docker
 docker rm unvlauncher-win
 
 ```

build-qt.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# Usage: [EXTRA_CMAKE_ARGS=<args...>] build-qt.sh [<qt submodule>...]
-# installs to ./qt/
+# Usage: [EXTRA_CMAKE_ARGS=<args...>] build-qt.sh <sysname> [<qt submodule>...]
+# installs to ./qt_<sysname>/
 
 set -e
 set -u
@@ -16,7 +16,7 @@ prefix_output() {
 module_vars() {
     url="https://download.qt.io/archive/qt/6.8/6.8.3/submodules/${1}-everywhere-src-6.8.3.tar.xz"
     archive="${url##*/}"
-    dirname="${archive%.tar.*}"
+    dirname="build_${sysname}/${archive%.tar.*}"
 }
 
 
@@ -35,9 +35,12 @@ build_module() {
     cmake --install .
 }
 
+sysname="${1}"
+shift
+
 WORK_DIR="${PWD}"
 SCRIPT_DIR=$(realpath "$(dirname "$0")")
-INSTALL_DIR="${WORK_DIR}/qt"
+INSTALL_DIR="${WORK_DIR}/qt_${sysname}"
 
 #FIXME bad warning in qtdeclarative-everywhere-src-6.8.3/src/quickwidgets/qquickwidget.cpp
 
@@ -46,38 +49,8 @@ common_options_cmake="
     -DQT_GENERATE_SBOM=OFF
     ${BUILDQT_CMAKE_ARGS:-}
 "
-options_qtbase="
-    -opensource
-    -confirm-license
-    -release
-    -optimize-size
-    -no-shared
-    -static
-    --c++std=17
-    -disable-deprecated-up-to 0x060800
-    -reduce-exports
-    -gc-binaries
-    -qpa xcb
-    -nomake tests
-    -nomake examples
-    -no-gif
-    -no-icu
-    -no-glib
-    -opengl desktop
-    -no-eglfs
-    -no-opengles3
-    -no-egl
-    -xkbcommon
-    -dbus-runtime
-    -qt-freetype
-    -qt-pcre
-    -qt-harfbuzz
-    -qt-libpng
-    -qt-libjpeg
-    -system-zlib
-    -openssl-linked
-    -prefix ${INSTALL_DIR}
-    --
+
+base_features='
     -DFEATURE_androiddeployqt=OFF
     -DFEATURE_animation=ON
     -DFEATURE_cborstreamwriter=OFF
@@ -139,7 +112,6 @@ options_qtbase="
     -DFEATURE_mimetype_database=OFF
     -DFEATURE_movie=OFF
     -DFEATURE_networkdiskcache=OFF
-    -DFEATURE_opengl_desktop=ON
     -DFEATURE_pdf=OFF
     -DFEATURE_picture=OFF
     -DFEATURE_printsupport=OFF
@@ -171,6 +143,9 @@ options_qtbase="
     -DFEATURE_stringlistmodel=OFF
     -DFEATURE_style_fusion=OFF
     -DFEATURE_style_stylesheet=OFF
+    -DFEATURE_style_windows=ON
+    -DFEATURE_style_windows11=OFF
+    -DFEATURE_style_windowsvista=OFF
     -DFEATURE_syntaxhighlighter=OFF
     -DFEATURE_systemtrayicon=OFF
     -DFEATURE_tabbar=OFF
@@ -205,10 +180,39 @@ options_qtbase="
     -DFEATURE_whatsthis=OFF
     -DFEATURE_widgettextcontrol=ON
     -DFEATURE_wizard=OFF
-    -DFEATURE_xcb=ON
-    -DFEATURE_xcb_glx_plugin=ON
     -DFEATURE_xml=OFF
     -DFEATURE_xmlstream=ON
+'
+
+options_qtbase="
+    -opensource
+    -confirm-license
+    -release
+    -optimize-size
+    -no-shared
+    -static
+    --c++std=17
+    -disable-deprecated-up-to 0x060800
+    -reduce-exports
+    -gc-binaries
+    -nomake tests
+    -nomake examples
+    -no-gif
+    -no-icu
+    -no-glib
+    -opengl desktop
+    -no-eglfs
+    -no-opengles3
+    -no-egl
+    -qt-freetype
+    -qt-pcre
+    -qt-harfbuzz
+    -qt-libpng
+    -qt-libjpeg
+    -prefix ${INSTALL_DIR}
+    --
+    ${base_features}
+    -DFEATURE_opengl_desktop=ON
     -DQT_BUILD_DOCS=OFF
 "
 options_qt5compat='--'
@@ -239,9 +243,80 @@ options_qtdeclarative='
     -DFEATURE_quicktemplates2_multitouch=OFF
 '
 
+case "${sysname}" in
+linux)
+    options_qtbase="
+        -dbus-runtime
+        -openssl-linked
+        -qpa xcb
+        -system-zlib
+        -xkbcommon
+        ${options_qtbase}
+        -DFEATURE_xcb=ON
+        -DFEATURE_xcb_glx_plugin=ON
+    "
+    ;;
+macos)
+    ;;
+windows)
+    options_qtbase="
+        -device-option CROSS_COMPILE=i686-w64-mingw32-
+        -xplatform win32-g++
+        -schannel
+        ${options_qtbase}
+        -DFEATURE_imageformat_xpm=ON
+        -DFEATURE_library=ON
+        -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/cross-toolchain-mingw32.cmake
+        -DQT_HOST_PATH=${WORK_DIR}/qt_tools
+    "
+    # -no-feature-d3d12
+
+    ;;
+tools)
+    options_qtbase="
+        --c++std=17
+        -release
+        -static
+        -qpa none
+        -no-opengl
+        -no-harfbuzz
+        -no-freetype
+        -no-ico
+        -no-gif
+        -no-xkbcommon
+        -no-openssl
+        -prefix ${INSTALL_DIR}
+        --
+        ${base_features}
+        -DFEATURE_widgets=OFF
+        -DFEATURE_network=OFF
+        -DFEATURE_harfbuzz=OFF
+        -DFEATURE_evdev=OFF
+        -DFEATURE_cursor=OFF
+        -DFEATURE_linuxfb=OFF
+        -DFEATURE_freetype=OFF
+        -DxxxFEATURE_pcre2=OFF
+        -DFEATURE_libinput=OFF
+        -DFEATURE_imageformat_jpeg=OFF
+        -DFEATURE_imageformat_png=OFF
+        -DFEATURE_imageformatplugin=OFF
+    "
+    options_qtdeclarative='
+        --
+    '
+    ;;
+*)
+    echo 'arg 1 should be linux|macos|windows'
+    exit 1
+esac
+
 # qt5compat depends on qtdeclarative
-# qtdeclarative depends on qtshadertools, qtsvg
-MODULES=${@:-qtbase qtsvg qtshadertools qtdeclarative qt5compat}
+# qtdeclarative depends on qtshadertools
+# qtdeclarative optionally depends on qtsvg but we don't actually want that?
+# Also in the tools build we strategically build qtdeclarative before qtshadertools to disable
+# the bulk of QML targets (TODO: disable them explicitly with options?)
+
+MODULES=${@:-qtbase qtshadertools qtdeclarative qt5compat qtsvg}
 
 # for bloaty
 # options_qtbase="-force-debug-info ${options_qtbase}"
@@ -260,11 +335,13 @@ wait
 
 md5sum --check --ignore-missing "${SCRIPT_DIR}/md5sums-qt.txt"
 
+mkdir -p "${WORK_DIR}/build_${sysname}"
+
 # Nuke old dir; extract in parallel
 for module in $MODULES; do
     module_vars "${module}"
     rm -rf "${dirname}"
-    tar -xJf "${archive}" &
+    tar -C "${WORK_DIR}/build_${sysname}" -xJf "${archive}" &
 done
 wait
 

qtbase.patch

@@ -21,6 +21,19 @@ diff -u -r qtbase.old/cmake/QtBuildHelpers.cmake qtbase.new/cmake/QtBuildHelpers
      qt_internal_set_link_depends_no_shared()
      qt_internal_setup_default_install_prefix()
      qt_internal_set_qt_source_tree_var()
+diff -u -r qtbase.old/src/plugins/platforms/windows/qwindowsmenu.h qtbase.new/src/plugins/platforms/windows/qwindowsmenu.h
+--- qtbase.old/src/plugins/platforms/windows/qwindowsmenu.h	2025-02-13 11:45:28.000000000 -0600
++++ qtbase.new/src/plugins/platforms/windows/qwindowsmenu.h	2025-11-17 03:52:17.033997423 -0600
+@@ -76,7 +76,9 @@
+     bool m_checkable = false;
+     bool m_checked = false;
+     bool m_enabled = true;
++#ifndef QT_NO_SHORTCUT
+     QKeySequence m_shortcut;
++#endif
+ };
+ 
+ class QWindowsMenu : public QPlatformMenu
 diff -u -r qtbase.old/src/tools/rcc/rcc.cpp qtbase.new/src/tools/rcc/rcc.cpp
 --- qtbase.old/src/tools/rcc/rcc.cpp	2025-02-13 11:45:28.000000000 -0600
 +++ qtbase.new/src/tools/rcc/rcc.cpp	2025-11-14 00:12:48.076214506 -0600