From c2c0211ad8aaaab3d1b6050e0cb5e8f18890afe3 Mon Sep 17 00:00:00 2001
From: danie1kr <37019555+danie1kr@users.noreply.github.com>
Date: Wed, 22 Feb 2023 19:45:47 +0100
Subject: [PATCH] updated buildscripts

recent changes made it necessary to add new packages to be installed and build options to be adapted
---
 Packaging/cpi-gamesh/__init__.py |  2 +-
 Packaging/cpi-gamesh/build.sh    | 13 +++++--------
 Packaging/cpi-gamesh/readme.md   |  2 ++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Packaging/cpi-gamesh/__init__.py b/Packaging/cpi-gamesh/__init__.py
index 6984834e5..e7394eaad 100644
--- a/Packaging/cpi-gamesh/__init__.py
+++ b/Packaging/cpi-gamesh/__init__.py
@@ -23,7 +23,7 @@ class DevilutionPage(Page):
 
 	_GameName = "devilutionX"
 	_GamePath = "/home/cpi/games/devilutionX"
-	_GameExecutable = _GamePath + "/bin/devilutionx"
+	_GameExecutable = _GamePath + "/build/devilutionx"
 	_GameExecutableRevision = _GameExecutable + ".rev"
 	_GameBuildScript = _GamePath + "/Packaging/cpi-gamesh/build.sh -t " + pipes.quote(os.path.dirname(os.path.abspath( __file__ )))
 	_GamePNG = _GamePath + "/Packaging/cpi-gamesh/Devilution.png"
diff --git a/Packaging/cpi-gamesh/build.sh b/Packaging/cpi-gamesh/build.sh
index 0a754edc4..4612c8e39 100755
--- a/Packaging/cpi-gamesh/build.sh
+++ b/Packaging/cpi-gamesh/build.sh
@@ -37,7 +37,7 @@ done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
 install_deps() {
-	sudo apt install -y cmake libsdl2-dev
+	sudo apt install -y cmake libsdl2-dev libbz2-dev libsodium-dev
 }
 
 main() {
@@ -47,19 +47,16 @@ main() {
 }
 
 build() {
-	mkdir -p ../../build
-	cd ../../build
+	cd ../..
 	rm -f CMakeCache.txt
 
-	cmake .. -DTARGET_PLATFORM=cpigamesh
-	make -j $(getconf _NPROCESSORS_ONLN)
+	cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DTARGET_PLATFORM=cpigamesh -DDISABLE_LTO=ON
+	cmake --build build -j $(getconf _NPROCESSORS_ONLN)
 	cd -
 }
 
 install() {
-	mkdir -p /home/cpi/games/devilutionX/bin
-	cp /home/cpi/games/devilutionX/build/devilutionx /home/cpi/games/devilutionX/bin
-	git rev-parse HEAD > /home/cpi/games/devilutionX/bin/devilutionx.rev
+	git rev-parse HEAD > /home/cpi/games/devilutionX/build/devilutionx.rev
 
 	if [ -z ${TARGET+x} ]; then
 		local target_dir="25_devilutionX"
diff --git a/Packaging/cpi-gamesh/readme.md b/Packaging/cpi-gamesh/readme.md
index fe329e48d..13436f803 100644
--- a/Packaging/cpi-gamesh/readme.md
+++ b/Packaging/cpi-gamesh/readme.md
@@ -14,6 +14,8 @@ When the compile is finished and the diabdat.mpq is in place at '/home/cpi/.loca
  - For the Polish voice pack download https://github.com/diasurgical/devilutionx-assets/releases/download/v1/pl.mpq.
 Enjoy!
 
+For ClockworkOS v0.5, buster-backports are required to have updated libraries: https://backports.debian.org/Instructions/
+
 ## Play devilutionX on the CPi GameShell
 
 When the game is compiled and the mpq files are in place, you can press "A" in the devilutionX menu to play.