forked from Mirrorlandia_minetest/minetest
Bump IrrlichtMt
This commit is contained in:
parent
d631f21024
commit
71f6a5f44e
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -230,7 +230,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
repository: minetest/irrlicht
|
repository: minetest/irrlicht
|
||||||
path: lib/irrlichtmt/
|
path: lib/irrlichtmt/
|
||||||
ref: "1.9.0mt6"
|
ref: "1.9.0mt7"
|
||||||
|
|
||||||
- name: Restore from cache and run vcpkg
|
- name: Restore from cache and run vcpkg
|
||||||
uses: lukka/run-vcpkg@v7
|
uses: lukka/run-vcpkg@v7
|
||||||
|
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -22,7 +22,7 @@ on:
|
|||||||
- '.github/workflows/macos.yml'
|
- '.github/workflows/macos.yml'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IRRLICHT_TAG: 1.9.0mt6
|
IRRLICHT_TAG: 1.9.0mt7
|
||||||
MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git
|
MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git
|
||||||
MINETEST_GAME_BRANCH: master
|
MINETEST_GAME_BRANCH: master
|
||||||
MINETEST_GAME_NAME: minetest_game
|
MINETEST_GAME_NAME: minetest_game
|
||||||
|
@ -9,7 +9,7 @@ stages:
|
|||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
IRRLICHT_TAG: "1.9.0mt6"
|
IRRLICHT_TAG: "1.9.0mt7"
|
||||||
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
|
||||||
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
|
||||||
|
|
||||||
|
@ -144,19 +144,19 @@ Compiling
|
|||||||
|
|
||||||
For Debian/Ubuntu users:
|
For Debian/Ubuntu users:
|
||||||
|
|
||||||
sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev
|
sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev
|
||||||
|
|
||||||
For Fedora users:
|
For Fedora users:
|
||||||
|
|
||||||
sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel
|
sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXi-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel
|
||||||
|
|
||||||
For Arch users:
|
For Arch users:
|
||||||
|
|
||||||
sudo pacman -S base-devel libcurl-gnutls cmake libxxf86vm libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd
|
sudo pacman -S base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd
|
||||||
|
|
||||||
For Alpine users:
|
For Alpine users:
|
||||||
|
|
||||||
sudo apk add build-base cmake libpng-dev jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev zstd-dev
|
sudo apk add build-base cmake libpng-dev jpeg-dev libxi-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev zstd-dev
|
||||||
|
|
||||||
#### Download
|
#### Download
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ done
|
|||||||
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
||||||
|
|
||||||
# Get stuff
|
# Get stuff
|
||||||
irrlicht_version=1.9.0mt6
|
irrlicht_version=1.9.0mt7
|
||||||
ogg_version=1.3.5
|
ogg_version=1.3.5
|
||||||
openal_version=1.21.1
|
openal_version=1.21.1
|
||||||
vorbis_version=1.3.7
|
vorbis_version=1.3.7
|
||||||
|
@ -45,7 +45,7 @@ done
|
|||||||
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
|
||||||
|
|
||||||
# Get stuff
|
# Get stuff
|
||||||
irrlicht_version=1.9.0mt6
|
irrlicht_version=1.9.0mt7
|
||||||
ogg_version=1.3.5
|
ogg_version=1.3.5
|
||||||
openal_version=1.21.1
|
openal_version=1.21.1
|
||||||
vorbis_version=1.3.7
|
vorbis_version=1.3.7
|
||||||
|
@ -10,7 +10,7 @@ install_linux_deps() {
|
|||||||
if [[ "$1" == "--no-irr" ]]; then
|
if [[ "$1" == "--no-irr" ]]; then
|
||||||
shift
|
shift
|
||||||
else
|
else
|
||||||
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt6/ubuntu-bionic.tar.gz"
|
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt7/ubuntu-bionic.tar.gz"
|
||||||
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
|
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user