From 1a59260de74747f3a38bb6ecb8df9643ccb05182 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Fri, 21 Nov 2025 22:42:49 +0800 Subject: [PATCH] Revert "try building qt with openssl for windows" This reverts commit ca895dfefe3e3d4b057cd50401ebd470acfbb9c2. --- .github/workflows/build.yml | 10 ++-------- script/build_qt_static_windows.bat | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fb0bbd..ea91bc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -154,13 +154,7 @@ jobs: uses: actions/cache@v4.2.3 with: path: qt6/build - key: QtStaticCache-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }}-${{ hashFiles('script/build_qt_static_windows.bat') }} - - name: Install OpenSSL (Windows) - if: matrix.platform == 'windows-latest' && steps.cache-static-Qt.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' - shell: powershell - run: | - echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - vcpkg install openssl:x64-mingw-static + key: QtStaticCache-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }} - name: Install Qt Windows shell: powershell if: matrix.platform == 'windows-latest' && steps.cache-static-Qt.outputs.cache-hit != 'true' && matrix.qt_version != '6.2.12' @@ -182,7 +176,7 @@ jobs: mkdir build cd build curl -fLso srslist.h "https://raw.githubusercontent.com/throneproj/routeprofiles/rule-set/srslist.h" - cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DOPENSSL_ROOT_DIR="$VCPKG_ROOT/installed/x64-mingw-static" -DCMAKE_BUILD_TYPE=Debug .. + cmake -GNinja -DCMAKE_CXX_FLAGS="-static" -DCMAKE_BUILD_TYPE=Debug .. ninja -j2 cd .. ./script/deploy_windows.sh diff --git a/script/build_qt_static_windows.bat b/script/build_qt_static_windows.bat index 6ceae92..da31317 100644 --- a/script/build_qt_static_windows.bat +++ b/script/build_qt_static_windows.bat @@ -3,7 +3,7 @@ cd qt6 git switch %1 mkdir build -CALL .\configure.bat -openssl-linked -release -static -prefix ./build -static-runtime -submodules qtbase,qtimageformats,qtsvg,qttranslations -skip tests -skip examples -gui -widgets -init-submodules -- -D OPENSSL_ROOT_DIR="%VCPKG_ROOT%/installed/x64-mingw-static" +CALL .\configure.bat -release -static -prefix ./build -static-runtime -submodules qtbase,qtimageformats,qtsvg,qttranslations -skip tests -skip examples -gui -widgets -init-submodules echo on branch %1 echo config complete, building... cmake --build . --parallel