From b5a4f81c596d5aa41184aeb83ba0081fce31c95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 12 Sep 2025 12:16:42 -0600 Subject: [PATCH] Minor cleanup of fontatlas scripts (they still need more cleanup) --- build_fontatlas.sh | 7 +++++-- buildatlas.sh | 5 ++++- font_atlasscript.txt | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build_fontatlas.sh b/build_fontatlas.sh index bb5dbfd3ed..41fc74e330 100755 --- a/build_fontatlas.sh +++ b/build_fontatlas.sh @@ -1,2 +1,5 @@ -./ext/native/tools/build/atlastool font_atlasscript.txt font 8888 && mv font_atlas.zim font_atlas.meta assets && rm font_atlas.cpp font_atlas.h -./ext/native/tools/build/atlastool asciifont_atlasscript.txt asciifont 8888 && mv asciifont_atlas.zim asciifont_atlas.meta assets && rm asciifont_atlas.cpp asciifont_atlas.h +TOOL=./ext/native/tools/build/atlastool +# TOOL=Windows/ARM64/Debug/AtlasTool.exe + +$TOOL font_atlasscript.txt font 8888 && mv font_atlas.zim font_atlas.meta assets && rm font_atlas.cpp font_atlas.h +$TOOL asciifont_atlasscript.txt asciifont 8888 && mv asciifont_atlas.zim asciifont_atlas.meta assets && rm asciifont_atlas.cpp asciifont_atlas.h diff --git a/buildatlas.sh b/buildatlas.sh index 0142b9b0c0..e16c716fc1 100755 --- a/buildatlas.sh +++ b/buildatlas.sh @@ -1 +1,4 @@ -./ext/native/tools/build/atlastool ui_atlasscript.txt ui 8888 && mv ui_atlas.zim ui_atlas.meta assets && rm ui_atlas.cpp ui_atlas.h +TOOL=./ext/native/tools/build/atlastool +# TOOL=Windows/ARM64/Debug/AtlasTool.exe + +$TOOL ui_atlasscript.txt ui 8888 && mv ui_atlas.zim ui_atlas.meta assets && rm ui_atlas.cpp ui_atlas.h diff --git a/font_atlasscript.txt b/font_atlasscript.txt index 3bffccd33d..fdae07e372 100644 --- a/font_atlasscript.txt +++ b/font_atlasscript.txt @@ -1,3 +1,3 @@ 2048 font UBUNTU24 assets/Roboto-Condensed.ttf UWERS 34 -2 -font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0 +font UBUNTU24 C:/dev/ARIALUNI.ttf UWEhkcRGHKVTeS 30 0