From 833552c639505ec1adb7ebadf72825a7c1e87f75 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 23 Dec 2020 15:38:13 -0500 Subject: [PATCH] Add Optional Dependencies --- build/DEBIAN/control | 2 +- build/build-irrlicht.sh | 2 ++ build/build-minetest.sh | 4 +++- build/install-dependencies.sh | 32 +++++++++++++++++++++++++++++++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/build/DEBIAN/control b/build/DEBIAN/control index 1a40b24..0ab506e 100644 --- a/build/DEBIAN/control +++ b/build/DEBIAN/control @@ -4,5 +4,5 @@ Maintainer: TheBrokenRail Description: A free open-source voxel game engine with easy modding and game creation. Homepage: https://www.minetest.net Architecture: arm64 -Depends: libc6, libstdc++6, libxxf86vm1, libgles1, libegl1, libsqlite3-0, libogg0, libvorbis0a, libopenal1, libcurl3-gnutls, libfreetype6, zlib1g, libgmp10, libxi6 +Depends: libc6, libstdc++6, libxxf86vm1, libgles1, libegl1, libsqlite3-0, libogg0, libvorbis0a, libopenal1, libcurl3-gnutls, libfreetype6, zlib1g, libgmp10, libxi6, libluajit-5.1-2, libleveldb1d, libncursesw6, libpq5 Conflicts: minetestc55, minetest, minetest-data, minetest-staging diff --git a/build/build-irrlicht.sh b/build/build-irrlicht.sh index d1539f1..98c661e 100755 --- a/build/build-irrlicht.sh +++ b/build/build-irrlicht.sh @@ -23,6 +23,8 @@ enable_feature() { disable_feature _IRR_COMPILE_WITH_OPENGL_ disable_feature _IRR_COMPILE_WITH_OGLES2_ disable_feature _IRR_COMPILE_WITH_WEBGL1_ +disable_feature _IRR_COMPILE_WITH_SOFTWARE_ +disable_feature _IRR_COMPILE_WITH_BURNINGSVIDEO_ enable_feature _IRR_COMPILE_WITH_OGLES1_ enable_feature _IRR_LINUX_X11_XINPUT2_ diff --git a/build/build-minetest.sh b/build/build-minetest.sh index 9f6c245..b069b0a 100755 --- a/build/build-minetest.sh +++ b/build/build-minetest.sh @@ -14,17 +14,19 @@ cd build-dir # Prepare Build cmake \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SYSTEM_PROCESSOR=aarch64 \ -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc \ -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \ -DENABLE_GLES=TRUE \ -DGLES_VERSION=1 \ - -DENABLE_TOUCH=ON \ + -DENABLE_TOUCH=TRUE \ -DRUN_IN_PLACE=FALSE \ -DBUILD_UNITTESTS=FALSE \ -DIRRLICHT_LIBRARY=../../irrlicht/lib/Linux/libIrrlicht.a \ -DIRRLICHT_INCLUDE_DIR=../../irrlicht/include \ + -DVERSION_EXTRA=mobile \ .. # Build diff --git a/build/install-dependencies.sh b/build/install-dependencies.sh index 16c8155..003d957 100755 --- a/build/install-dependencies.sh +++ b/build/install-dependencies.sh @@ -5,4 +5,34 @@ 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 subversion +apt-get install -y \ + # Build Tools + gcc-aarch64-linux-gnu \ + g++-aarch64-linux-gnu \ + make \ + cmake \ + git \ + dos2unix \ + dpkg-dev \ + wget \ + subversion \ + # Dependencies + libc6-dev:arm64 \ + 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 \ + libxi-dev:arm64 \ + libluajit-5.1-dev:arm64 \ + libleveldb-dev:arm64 \ + libncurses-dev:arm64 \ + libpq-dev:arm64