From e2e73120f6f2a88f2d39a71752a75452e0f5e188 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Mon, 21 Dec 2020 19:33:22 -0500 Subject: [PATCH] Use Newer Irrlicht --- build/build-irrlicht.sh | 8 +++----- build/install-dependencies.sh | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/build-irrlicht.sh b/build/build-irrlicht.sh index c8f5333..64325f1 100755 --- a/build/build-irrlicht.sh +++ b/build/build-irrlicht.sh @@ -1,19 +1,17 @@ #!/bin/sh -IRRLICHT_VERSION='ab46f76665cd621aedc96f938169f3dfe8815154' +IRRLICHT_VERSION='6172' set -e -git clone https://github.com/zaki/irrlicht.git -b ogl-es +svn export -r "${IRRLICHT_VERSION}" svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht cd irrlicht -git checkout "${IRRLICHT_VERSION}" - dos2unix source/Irrlicht/CIrrDeviceLinux.cpp dos2unix source/Irrlicht/Makefile dos2unix include/IrrCompileConfig.h -wget -O - https://sourceforge.net/p/irrlicht/patches/_discuss/thread/97431334ce/c73a/attachment/multitouch.patch | patch -p1 +wget -O - https://sourceforge.net/p/irrlicht/patches/_discuss/thread/97431334ce/37b2/f348/0599/6df8/attachment/multitouch-and-phosh-fix.patch | patch -p1 disable_feature() { sed -i "s/^#define $1.*$//g" include/IrrCompileConfig.h diff --git a/build/install-dependencies.sh b/build/install-dependencies.sh index ab9f167..16c8155 100755 --- a/build/install-dependencies.sh +++ b/build/install-dependencies.sh @@ -5,4 +5,4 @@ set -e dpkg --add-architecture arm64 apt-get update apt-get dist-upgrade -y -apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu make libc6-dev:arm64 cmake libbz2-dev:arm64 libpng-dev:arm64 libjpeg-dev:arm64 libxxf86vm-dev:arm64 libglvnd-dev:arm64 libsqlite3-dev:arm64 libogg-dev:arm64 libvorbis-dev:arm64 libopenal-dev:arm64 libcurl4-gnutls-dev:arm64 libfreetype6-dev:arm64 zlib1g-dev:arm64 libgmp-dev:arm64 libjsoncpp-dev:arm64 git libxi-dev:arm64 dos2unix dpkg-dev wget +apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu make libc6-dev:arm64 cmake libbz2-dev:arm64 libpng-dev:arm64 libjpeg-dev:arm64 libxxf86vm-dev:arm64 libglvnd-dev:arm64 libsqlite3-dev:arm64 libogg-dev:arm64 libvorbis-dev:arm64 libopenal-dev:arm64 libcurl4-gnutls-dev:arm64 libfreetype6-dev:arm64 zlib1g-dev:arm64 libgmp-dev:arm64 libjsoncpp-dev:arm64 git libxi-dev:arm64 dos2unix dpkg-dev wget subversion