X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=makefont.py;h=1651ace694eab7f2923b539db489f30e467434c5;hb=aceaa08be594ac708efcd0b68e5d08547cbcbbe1;hp=c61c1d5ad7fd9573f0ae5d53e30e06d06a59257c;hpb=a9e9bb12274c4b00eabdc00d14c61f0df18956b5;p=libs%2Fgl.git

diff --git a/makefont.py b/makefont.py
index c61c1d5a..1651ace6 100755
--- a/makefont.py
+++ b/makefont.py
@@ -8,7 +8,7 @@ def convert_def(fn):
 	line=src.readline()
 	tw,th,fh,fa,fd=map(int, line.split())
 
-	result="default_size %d;\n"%fh
+	result="native_size %d;\n"%fh
 	result+="ascent %.3f;\n"%(float(fa)/fh)
 	result+="descent %.3f;\n"%(float(fd)/fh)
 
@@ -30,7 +30,7 @@ def make_font(fn, size):
 	if os.system("ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d"%(fn, size)):
 		raise Exception("Could not execute ttf2png")
 
-	result="texture_inline\n{\n"
+	result="texture\n{\n"
 	result+=maketex.make_tex("makefont-tmp.png")
 	result+="};\n"
 	result+=convert_def("makefont-tmp.def")