diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 001be49..56d4b9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,9 +93,9 @@ jobs: uses: actions/checkout@v4.2.2 with: submodules: "recursive" - - name: Install MSVC compiler + - name: Install mingw if: matrix.platform == 'windows-latest' - uses: ilammy/msvc-dev-cmd@v1.13.0 + uses: bwoodsend/setup-winlibs-action@v1.15 - name: Download Artifacts uses: actions/download-artifact@v4.1.8 @@ -105,6 +105,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4.1.1 with: + arch: win64_mingw version: ${{ matrix.qt_version }} setup-python: true modules: qtcharts @@ -128,8 +129,8 @@ jobs: shell: bash if: matrix.platform == 'windows-latest' env: - CC: cl.exe - CXX: cl.exe + CC: gcc.exe + CXX: g++.exe run: | mkdir build cd build diff --git a/script/deploy_windows64.sh b/script/deploy_windows64.sh index 79ae62b..0f527f6 100755 --- a/script/deploy_windows64.sh +++ b/script/deploy_windows64.sh @@ -21,7 +21,7 @@ mv $DEPLOYMENT/public_res/* $DEST #### deploy qt & DLL runtime #### pushd $DEST -windeployqt nekoray.exe --no-translations --no-system-d3d-compiler --no-compiler-runtime --no-opengl-sw --no-svg --verbose 2 +windeployqt nekoray.exe --no-translations --no-system-d3d-compiler --no-opengl-sw --no-svg --verbose 2 popd rm -rf $DEST/dxcompiler.dll $DEST/dxil.dll