From 24cfb73bffcf29318428a2a2807b5eb0b880327a Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 18 Mar 2017 16:32:41 +0100 Subject: [PATCH] Minor script updates --- build_ppgeatlas.sh | 2 +- buildatlas.sh | 4 +++- ext/native/tools/atlastool.cpp | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build_ppgeatlas.sh b/build_ppgeatlas.sh index 4d7547ae10..0df58413c1 100755 --- a/build_ppgeatlas.sh +++ b/build_ppgeatlas.sh @@ -1 +1 @@ -./atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util && cp ppge_atlas.zim assets && mv ppge_atlas.zim android/assets +./ext/native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util && cp ppge_atlas.zim assets && mv ppge_atlas.zim android/assets diff --git a/buildatlas.sh b/buildatlas.sh index 3584ced0f8..2a29737080 100755 --- a/buildatlas.sh +++ b/buildatlas.sh @@ -1,4 +1,6 @@ -./ext/native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && cp ui_atlas.zim android/assets && cp ui_atlas.zim.png ui_atlas_high.zim.png && mv ui_atlas.cpp ui_atlas_highmem.cpp && mv ui_atlas.h UI +# build the lowmem first so we see the output of the big one last. + ./ext/native/tools/build/atlastool atlasscript_lowmem.txt ui 8888 && mv ui_atlas.zim assets/ui_atlas_lowmem.zim && mv ui_atlas.cpp ui_atlas_lowmem.cpp +./ext/native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && cp ui_atlas.zim android/assets && cp ui_atlas.zim.png ui_atlas_high.zim.png && mv ui_atlas.cpp ui_atlas_highmem.cpp && mv ui_atlas.h UI diff -I'^//.*' -D USING_QT_UI ui_atlas_highmem.cpp ui_atlas_lowmem.cpp > UI/ui_atlas.cpp rm ui_atlas_highmem.cpp ui_atlas_lowmem.cpp ui_atlas.h diff --git a/ext/native/tools/atlastool.cpp b/ext/native/tools/atlastool.cpp index 3e027e5847..804d4198bf 100644 --- a/ext/native/tools/atlastool.cpp +++ b/ext/native/tools/atlastool.cpp @@ -411,8 +411,8 @@ void RasterizeFonts(const FontReferenceList &fontRefs, vector &ranges break; } } - if (!foundMatch) - fprintf(stderr, "WARNING: No font contains character %x.\n", kar); + //if (!foundMatch) + // fprintf(stderr, "WARNING: No font contains character %x.\n", kar); Image img; if (filtered || 0 != FT_Load_Char(font, kar, FT_LOAD_RENDER|FT_LOAD_MONOCHROME)) { @@ -969,5 +969,4 @@ int main(int argc, char **argv) { fprintf(h_file, "extern const Atlas %s_atlas;\n", atlas_name); fprintf(h_file, "extern const AtlasImage %s_images[%i];\n", atlas_name, (int)images.size()); fclose(h_file); - // TODO: Turn into C++ arrays. }