Use MSVC to build Win artifacts

sgsaenger · Oct 10, 2024 · 31abbc0 · 31abbc0
1 parent fbfbad9
commit 31abbc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 48 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
                     - os: windows-latest
                       script: make-win-archive.sh
                       artifact: Vipster-Win-x86_64.zip
-                      qt_arch: win64_mingw
+                      qt_arch: win64_msvc2022_64
                     #- os: macOS-latest
                     #  script: make-macos-app.sh
                     #  artifact: Vipster-macOS-x86_64.dmg
@@ -101,28 +101,6 @@ jobs:
               dir: ${{ github.workspace }}
               cache: true
 
-        - name: Cache MinGW
-          if: runner.os == 'Windows'
-          id: cache-mingw
-          uses: actions/cache@v4
-          with:
-              path: MinGW
-              key: mingw-19.0
-        - name: Install MinGW
-          if: (runner.os == 'Windows') && (steps.cache-mingw.outputs.cache-hit != 'true')
-          shell: bash
-          run: |
-              choco install wget -y --no-progress
-              wget https://nuwen.net/files/mingw/mingw-19.0.exe
-              7z x mingw-19.0.exe
-              MinGW/set_distro_paths.bat
-        - name: Configure MinGW
-          if: runner.os == 'Windows'
-          shell: bash
-          run: |
-              echo $GITHUB_WORKSPACE/MinGW/bin >> $GITHUB_PATH
-              echo CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/MinGW:$CMAKE_PREFIX_PATH >> $GITHUB_ENV
-
         - name: Configure Linux
           if: runner.os == 'Linux'
           shell: bash
@@ -206,29 +184,6 @@ jobs:
           with:
               submodules: true
 
-        - name: Cache MinGW
-          if: runner.os == 'Windows'
-          id: cache-mingw
-          uses: actions/cache@v4
-          with:
-              path: MinGW
-              key: mingw-19.0
-        - name: Install MinGW
-          if: (runner.os == 'Windows') && (steps.cache-mingw.outputs.cache-hit != 'true')
-          shell: bash
-          run: |
-              choco install wget -y --no-progress
-              wget https://nuwen.net/files/mingw/mingw-19.0.exe
-              7z x mingw-19.0.exe
-              MinGW/set_distro_paths.bat
-        - name: Configure MinGW
-          if: runner.os == 'Windows'
-          shell: bash
-          run: |
-              echo $GITHUB_WORKSPACE/MinGW/bin >> $GITHUB_PATH
-              echo CMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/MinGW:$CMAKE_PREFIX_PATH >> $GITHUB_ENV
-              echo CMAKE_GENERATOR="MSYS Makefiles" >> $GITHUB_ENV
-
         - name: Setup Python
           uses: actions/setup-python@v5
           with:

diff --git a/util/make-win-archive.sh b/util/make-win-archive.sh
@@ -8,7 +8,8 @@ mkdir ${TMPDIR}
 # Vipster itself
 echo "Copying vipster"
 cp gui/qt/vipster.exe ${TMPDIR}
-cp vipster/libvipster.dll ${TMPDIR}
+cp vipster/vipster.dll ${TMPDIR}
+cp vipster/vipster.lib ${TMPDIR}
 
 # copy the local python installation
 echo "Obtain python"
@@ -19,7 +20,6 @@ cp -r $pythonLocation/Lib $pythonLocation/DLLs ${TMPDIR}
 # prepare Qt and other libraries
 echo "Run windeployqt"
 windeployqt --compiler-runtime --no-translations ${TMPDIR}/vipster.exe
-cp ${QT_ROOT_DIR}/bin/lib{gcc_s_seh-1,stdc++-6,winpthread-1}.dll deploy
 
 echo "Create zip archive"
 7z a Vipster-Win-x86_64.zip ${TMPDIR}/*