From 70049d51953ba6a0e3cf510044555e429dab3c42 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Tue, 28 May 2024 14:05:56 +0300 Subject: [PATCH] Updated Makefile for aarch64 --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6469c42..9906fe8 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,17 @@ SERVER = src/godot/bin/godot_server.x11.opt.tools.64 .PHONY: all godot-editor-main export export-models export-clothes export-clean export-linux-demo export-windows-demo export-binaries patch all: godot-editor-main godot-main +ARCH=$(patsubst aarch64,arm64,$(shell uname -i)) godot-main: patch cd src/godot; \ - scons platform=x11 target=release tools=no custom_modules=../modules -j16; \ - scons platform=x11 target=release_debug tools=no custom_modules=../modules -j16; + scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \ + scons platform=x11 arch=$(ARCH) target=release_debug tools=no custom_modules=../modules -j16; cd src/godot; \ - scons platform=x11 target=release tools=no custom_modules=../modules -j16; \ + scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \ scons platform=server target=release_debug tools=yes custom_modules=../modules -j16 godot-editor-main: patch cd src/godot; \ - scons platform=x11 target=release_debug tools=yes custom_modules=../modules -j16; + scons platform=x11 arch=$(ARCH) target=release_debug tools=yes custom_modules=../modules -j16; patch: ./src/godot/scene/animation/skeleton_ik.cpp cd ./src/godot && git reset --hard HEAD && for p in ../patches/*.patch; do git apply $$p; done sed -e 's/ERR_FAIL_COND_V(-1 == p_task->root_bone, false);//g' -i ./src/godot/scene/animation/skeleton_ik.cpp