From 6eedf347bab7c992c91e98cf2568411b29cead94 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Tue, 28 Jan 2025 12:35:30 +0300 Subject: [PATCH] Updated Makefile --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cbae6d5..f034dc6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ -BLENDER = ../../blender-3.3.1-linux-x64/blender +BLENDER = ../../blender-4.3.2-linux-x64/blender 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 tests +.PHONY: all godot-editor-main export export-models export-clothes \ + export-clean export-linux-demo export-windows-demo \ + export-binaries patch tests import-vrm all: godot-editor-main godot-main ARCH=$(patsubst aarch64,arm64,$(shell uname -i)) godot-main: patch @@ -23,13 +25,18 @@ export: export-models export-clothes rm -Rf godot/.import export-clean: + rm -Rf godot/character-data/* rm -f assets/blender/scripts/tmp-*.blend -export-models: export-clean +import-vrm: export-clean + $(BLENDER) -b -Y -P assets/blender/scripts/import_vrm.py + +export-models: export-clean import-vrm $(BLENDER) -b -Y -P assets/blender/scripts/export_models.py export-clothes: export-clean $(BLENDER) -b -Y -P assets/blender/scripts/export_clothes.py + export-binaries: mkdir -p export $(SERVER) --path godot --export linux_demo ../export/office-demo-linux.x86_64