Skip to content
Permalink
Browse files

CI: update configurations for Irrlicht fork

  • Loading branch information
sfan5 committed Mar 9, 2021
1 parent 91c9313 commit 75eb28b95994781d52eb2c09303b1cd04e32b6c5
Showing with 28 additions and 13 deletions.
  1. +5 −2 .github/workflows/build.yml
  2. +7 −5 util/buildbot/buildwin32.sh
  3. +7 −5 util/buildbot/buildwin64.sh
  4. +9 −1 util/ci/common.sh
@@ -124,7 +124,7 @@ jobs:
- name: Install deps
run: |
source ./util/ci/common.sh
install_linux_deps clang-9
install_linux_deps --old-irr clang-9
- name: Build prometheus-cpp
run: |
@@ -212,7 +212,10 @@ jobs:

msvc:
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:
VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0
# 2020.11
@@ -31,7 +31,7 @@ if [ -z "$toolchain_file" ]; then
fi
echo "Using $toolchain_file"

irrlicht_version=1.8.4
irrlicht_version=1.9.0mt0
ogg_version=1.3.2
vorbis_version=1.3.5
curl_version=7.65.3
@@ -48,7 +48,7 @@ mkdir -p $libdir
cd $builddir

# Get stuff
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win32.zip \
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip \
-c -O $packagedir/irrlicht-$irrlicht_version.zip
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win32.zip \
-c -O $packagedir/zlib-$zlib_version.zip
@@ -102,6 +102,8 @@ if [ "x$NO_MINETEST_GAME" = "x" ]; then
cd ..
fi

irr_dlls=$(echo $libdir/irrlicht/bin/*.dll | tr ' ' ';')

# Build the thing
[ -d _build ] && rm -Rf _build/
mkdir _build
@@ -118,9 +120,9 @@ cmake .. \
-DENABLE_FREETYPE=1 \
-DENABLE_LEVELDB=1 \
\
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win32-gcc/libIrrlicht.dll.a \
-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win32-gcc/Irrlicht.dll \
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
-DIRRLICHT_DLL="$irr_dlls" \
\
-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -20,7 +20,7 @@ packagedir=$builddir/packages
libdir=$builddir/libs

toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
irrlicht_version=1.8.4
irrlicht_version=1.9.0mt0
ogg_version=1.3.2
vorbis_version=1.3.5
curl_version=7.65.3
@@ -37,7 +37,7 @@ mkdir -p $libdir
cd $builddir

# Get stuff
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://minetest.kitsunemimi.pw/irrlicht-$irrlicht_version-win64.zip \
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip \
-c -O $packagedir/irrlicht-$irrlicht_version.zip
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip \
-c -O $packagedir/zlib-$zlib_version.zip
@@ -92,6 +92,8 @@ if [ "x$NO_MINETEST_GAME" = "x" ]; then
cd ..
fi

irr_dlls=$(echo $libdir/irrlicht/bin/*.dll | tr ' ' ';')

# Build the thing
[ -d _build ] && rm -Rf _build/
mkdir _build
@@ -108,9 +110,9 @@ cmake .. \
-DENABLE_FREETYPE=1 \
-DENABLE_LEVELDB=1 \
\
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/Win64-gcc/libIrrlicht.dll.a \
-DIRRLICHT_DLL=$libdir/irrlicht/bin/Win64-gcc/Irrlicht.dll \
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
-DIRRLICHT_DLL="$irr_dlls" \
\
-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
@@ -2,12 +2,20 @@

# Linux build only
install_linux_deps() {
local pkgs=(libirrlicht-dev cmake libbz2-dev libpng-dev \
local pkgs=(cmake libpng-dev \
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev \
gettext libpq-dev postgresql-server-dev-all libleveldb-dev \
libcurl4-openssl-dev)

if [[ "$1" == "--old-irr" ]]; then
shift
pkgs+=(libirrlicht-dev)
else
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt0/ubuntu-bionic.tar.gz"
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
fi

sudo apt-get update
sudo apt-get install -y --no-install-recommends ${pkgs[@]} "$@"
}

0 comments on commit 75eb28b

Please sign in to comment.