Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 03:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows Visual Studio actions (#11176)

Browse Source 
Co-authored-by: rubenwardy <rw@rubenwardy.com>
This commit is contained in:
LoneWolfHT 2022-05-04 14:55:02 -07:00 committed by GitHub
parent cc56ebd90d
commit 47cf257c40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/build.yml vendored
View File

@ -199,13 +199,10 @@ jobs:
msvc: msvc:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2019 runs-on: windows-2019
#### Disabled due to Irrlicht switch
if: false
#### Disabled due to Irrlicht switch
env: env:
VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0 VCPKG_VERSION: 5cf60186a241e84e8232641ee973395d4fde90e1
# 2020.11 # 2022.02
vcpkg_packages: irrlicht zlib zstd curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -227,10 +224,17 @@ jobs:
steps: steps:
- name: Checkout - 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 - name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v5 uses: lukka/run-vcpkg@v7
with: with:
vcpkgArguments: ${{env.vcpkg_packages}} vcpkgArguments: ${{env.vcpkg_packages}}
vcpkgDirectory: '${{ github.workspace }}\vcpkg' vcpkgDirectory: '${{ github.workspace }}\vcpkg'
@ -238,7 +242,7 @@ jobs:
vcpkgGitCommitId: ${{ env.VCPKG_VERSION }} vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }} vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
- name: CMake - name: Minetest CMake
run: | run: |
cmake ${{matrix.config.generator}} ` cmake ${{matrix.config.generator}} `
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" `
@ -246,7 +250,7 @@ jobs:
-DENABLE_POSTGRESQL=OFF ` -DENABLE_POSTGRESQL=OFF `
-DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
- name: Build - name: Build Minetest
run: cmake --build . --config Release run: cmake --build . --config Release
- name: CPack - name: CPack

7
src/CMakeLists.txt
View File

@ -826,13 +826,14 @@ if(WIN32)
if(LUA_DLL) if(LUA_DLL)
install(FILES ${LUA_DLL} DESTINATION ${BINDIR}) install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
endif() endif()
if(BUILD_CLIENT AND IRRLICHT_DLL)
install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
endif()
if(BUILD_CLIENT AND USE_GETTEXT AND GETTEXT_DLL) if(BUILD_CLIENT AND USE_GETTEXT AND GETTEXT_DLL)
install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR}) install(FILES ${GETTEXT_DLL} DESTINATION ${BINDIR})
endif() endif()
endif() endif()
if(BUILD_CLIENT AND IRRLICHT_DLL)
install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
endif()
endif() endif()
if(BUILD_CLIENT) if(BUILD_CLIENT)