Fix Windows Visual Studio actions (#11176)

Co-authored-by: rubenwardy <rw@rubenwardy.com>

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78027d09c6463f60a87572668af64a645902df3c..61b9833be14cf19ebd388ea3d48b3b8453133971 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,13 +199,10 @@ jobs:
   msvc:
     name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
     runs-on: windows-2019
-    #### Disabled due to Irrlicht switch
-    if: false
-    #### Disabled due to Irrlicht switch
     env:
-      VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0
-#                    2020.11
-      vcpkg_packages: irrlicht zlib zstd curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit
+      VCPKG_VERSION: 5cf60186a241e84e8232641ee973395d4fde90e1
+      # 2022.02
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
     strategy:
       fail-fast: false
       matrix:
@@ -227,10 +224,17 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Checkout IrrlichtMT
+        uses: actions/checkout@v3
+        with:
+          repository: minetest/irrlicht
+          path: lib/irrlichtmt/
+          ref: "1.9.0mt4"
 
       - name: Restore from cache and run vcpkg
-        uses: lukka/run-vcpkg@v5
+        uses: lukka/run-vcpkg@v7
         with:
           vcpkgArguments: ${{env.vcpkg_packages}}
           vcpkgDirectory: '${{ github.workspace }}\vcpkg'
@@ -238,7 +242,7 @@ jobs:
           vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
           vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
 
-      - name: CMake
+      - name: Minetest CMake
         run: |
           cmake ${{matrix.config.generator}}  `
           -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
@@ -246,7 +250,7 @@ jobs:
           -DENABLE_POSTGRESQL=OFF  `
           -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
 
-      - name: Build
+      - name: Build Minetest
         run: cmake --build . --config Release
 
       - name: CPack

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f9ec419e97ee820a7b309d4d227e3644bc081901..03e48ddbd37c959f66b0939a2eba2dbcdfec128c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -826,13 +826,14 @@ if(WIN32)
                if(LUA_DLL)
                        install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
                endif()
-               if(BUILD_CLIENT AND IRRLICHT_DLL)
-                       install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
-               endif()
                if(BUILD_CLIENT AND USE_GETTEXT AND GETTEXT_DLL)
                        install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
                endif()
        endif()
+
+       if(BUILD_CLIENT AND IRRLICHT_DLL)
+               install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
+       endif()
 endif()
 
 if(BUILD_CLIENT)