BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

master #5

Merged
BRNSystems merged 45 commits from Mirrorlandia_minetest/irrlicht:master into master 2024-02-27 13:26:18 +01:00
Conversation 0 Commits 45 Files Changed 188 +22 -25
4 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f11d2f950 - Show all commits

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

@ -144,14 +144,14 @@ jobs:
- name: Install compiler - name: Install compiler
run: | run: |
sudo apt-get update && sudo apt-get install cmake -qyy sudo apt-get update && sudo apt-get install cmake -qyy
./scripts/ci-get-mingw.sh ${{matrix.config.arch}} ./scripts/ci-get-mingw.sh
- name: Build - name: Build
run: | run: |
./scripts/ci-build-mingw.sh package ./scripts/ci-build-mingw.sh package
env: env:
CC: ${{matrix.config.arch}}-w64-mingw32-gcc CC: ${{matrix.config.arch}}-w64-mingw32-clang
CXX: ${{matrix.config.arch}}-w64-mingw32-g++ CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
extras: ${{matrix.config.extras}} extras: ${{matrix.config.extras}}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

13
scripts/ci-build-mingw.sh
View File

@ -12,7 +12,7 @@ with_sdl=0
libjpeg_version=3.0.1 libjpeg_version=3.0.1
libpng_version=1.6.40 libpng_version=1.6.40
sdl2_version=2.28.5 sdl2_version=2.28.5
zlib_version=1.3 zlib_version=1.3.1
download () { download () {
local url=$1 local url=$1
@ -25,13 +25,14 @@ download () {
unzip -o "$filename" -d "$foldername" unzip -o "$filename" -d "$foldername"
} }
libs=$PWD/libs
mkdir -p libs mkdir -p libs
pushd libs pushd libs
libs=$PWD libhost="http://minetest.kitsunemimi.pw"
download "http://minetest.kitsunemimi.pw/libjpeg-$libjpeg_version-$variant.zip" download "$libhost/llvm/libjpeg-$libjpeg_version-$variant.zip"
download "http://minetest.kitsunemimi.pw/libpng-$libpng_version-$variant.zip" download "$libhost/llvm/libpng-$libpng_version-$variant.zip"
[ $with_sdl -eq 1 ] && download "http://minetest.kitsunemimi.pw/sdl2-$sdl2_version-$variant.zip" [ $with_sdl -eq 1 ] && download "$libhost/llvm/sdl2-$sdl2_version-$variant.zip"
download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-$variant.zip" download "$libhost/llvm/zlib-$zlib_version-$variant.zip"
popd popd
tmp=( tmp=(

9
scripts/ci-get-mingw.sh
View File

@ -1,12 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
[ -z "$1" ] && exit 255
ver=13.2.0 name=llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
os=ubuntu22.04 wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/$name" -O "$name"
name="mingw-w64-${1}_${ver}_${os}.tar.xz"
wget "http://minetest.kitsunemimi.pw/$name" -O "$name"
sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt") sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt")
sudo tar -xaf "$name" -C /usr sudo tar -xaf "$name" -C /usr --strip-components=1
rm -f "$name" rm -f "$name"

19
scripts/sha256sums.txt
View File

@ -1,10 +1,9 @@
a7dc54d5fb9f841eae26ee17f6146c0b7a0e5d99a914866a394b723dffc83316 libjpeg-3.0.1-win32.zip 0f21ff3be90311092fe32e0e30878ef3ae9d9437b8d9ac25ef279e0d84e9bb8e llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
cd1f667ed2d24d96e1d61fcf91ba6d7b11270a4903e36f08e640971884caaccd libjpeg-3.0.1-win64.zip 53dfd31285f470fcf0dca88217c5cf9c557729af6d103afae5936e72ddc38d3c libjpeg-3.0.1-win32.zip
72a624fbaef15909f80976c9c569717e9438bd34c3209071378f05487e859f8a libpng-1.6.40-win32.zip 3d44e0740914e6878300e30653aad39e974821b5d7f6c2567e246b4eb04a5324 libjpeg-3.0.1-win64.zip
8e2552f6965c385f7e2467018d583fd206744db18e36656ddf1c07c8663ea23f libpng-1.6.40-win64.zip 6baf4e819bfb3573760524b5dc9a04b5e479090d6d2046b86cf39a3107c0071f libpng-1.6.40-win32.zip
9f0cfab8ca089d48be7a59f85d5fd5648f18f54c91d7ac6c31b281ba5e90852a mingw-w64-i686_13.2.0_ubuntu22.04.tar.xz c02e029f01fce44baea7f4aecfd2564bd8a03507c0c6af8b03339ae0452c8b7d libpng-1.6.40-win64.zip
93bc9f04d43a023358d1ae2b76dec42d3d79baecd452402ee9fb3ee21945fdfe mingw-w64-x86_64_13.2.0_ubuntu22.04.tar.xz f9f890af960e92fd3f532f2e9ac00681c33bc67a722e000dfdaeb41b0064f1a0 sdl2-2.28.5-win32.zip
2abdc82b4cac710bab0b3e9f9a9c38cc242abcca443c1e1f7af51d29a5eb5457 sdl2-2.28.5-win32.zip 8dde2c6963544b7d8a2e87c128ebbdf51ad0e70c7e2df986ff4e963ce9996d9b sdl2-2.28.5-win64.zip
949a3de77d1c97240ee4b35e15495962b5effb816f7f03efe5c6edd8975a8b19 sdl2-2.28.5-win64.zip 8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c zlib-1.3.1-win32.zip
3c5abd40e9492c834651d995db6bbf0f57a7579d091d2d03110293b95e9b039a zlib-1.3-win32.zip ad43f5d23052590c65633530743e5d622cc76b33c109072e6fd7b487aff56bca zlib-1.3.1-win64.zip
f63d9a38c2ee56fa1e95a486224c274412cb5b3275734c1da53b0a68a7e8c654 zlib-1.3-win64.zip