Merge pull request #3240 from rohkea/fix/ttyp0-changes

ttyp0 changes (remove Thai and Hebrew), generator fix
EasyRPG · Jul 2, 2024 · 4077070 · 4077070
2 parents a650f92 + 4824021
commit 4077070
Show file tree

Hide file tree

Showing 5 changed files with 7,715 additions and 7,768 deletions.
diff --git a/resources/shinonome/generate_cxx_font.rb b/resources/shinonome/generate_cxx_font.rb
@@ -4,6 +4,8 @@
 
 FONT_SIZE = 12
 EMPTY_CHAR = Array.new(FONT_SIZE, 0x0)
+OUTPUT_FOLDER='../../src/generated'
+
 
 def skip_until(f, regex)
   while(not f.eof?)
@@ -194,19 +196,19 @@ def read_bdf_chars(f)
 gothic_final = gothic.merge(hankaku) \
 	.merge(korean).merge(chinese).merge(latin) \
     .merge(latin_ext_a).merge(extras).merge(extras_fullwidth)
-code_max = write_all(File.new("../../src/shinonome_gothic.h", "w"), "SHINONOME_GOTHIC", gothic_final)
+code_max = write_all(File.new("#{OUTPUT_FOLDER}/shinonome_gothic.h", "w"), "SHINONOME_GOTHIC", gothic_final)
 print "done\n"
 
 print "Generating Mincho..."
-code_max = [write_all(File.new("../../src/shinonome_mincho.h", "w"), "SHINONOME_MINCHO", mincho), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/shinonome_mincho.h", "w"), "SHINONOME_MINCHO", mincho), code_max].max
 print "done\n"
 
 print "Generating RMG2000..."
-code_max = [write_all(File.new("../../src/bitmapfont_rmg2000.h", "w"), "BITMAPFONT_RMG2000", rmg2000), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/bitmapfont_rmg2000.h", "w"), "BITMAPFONT_RMG2000", rmg2000), code_max].max
 print "done\n"
 
 print "Generating ttyp0..."
-code_max = [write_all(File.new("../../src/bitmapfont_ttyp0.h", "w"), "BITMAPFONT_TTYP0", ttyp0), code_max].max
+code_max = [write_all(File.new("#{OUTPUT_FOLDER}/bitmapfont_ttyp0.h", "w"), "BITMAPFONT_TTYP0", ttyp0), code_max].max
 print "done\n"
 
 print "done\n"