diff --git a/radio/src/Makefile b/radio/src/Makefile index 515715e7d..c7d077f69 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -393,8 +393,13 @@ endif IMG2LBM = -$(PYTHON) ../util/img2lbm.py BIN2LBM = -$(PYTHON) ../util/bin2lbm.py -FONT2PNG = -$(PYTHON) ../util/font2png.py +ifeq ($(OS), Windows_NT) + FONT2PNG = -$(PYTHON) ../util/font2png.py +else + FONT2PNG = -xvfb-run --server-args="-screen 0 1024x768x24" $(PYTHON) ../util/font2png.py +endif TRANSLATE = -$(PYTHON) ../util/translate.py + VERSION = 2.2.0$(OPENTX_VERSION_SUFFIX) THIRDPARTY = thirdparty diff --git a/radio/util/font2png.py b/radio/util/font2png.py index f9f5a3f20..47ddec9fd 100755 --- a/radio/util/font2png.py +++ b/radio/util/font2png.py @@ -44,7 +44,9 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro font.setPixelSize(fontsize) font.setBold(fontbold) font.setHintingPreference(QtGui.QFont.PreferNoHinting) + font.setStyleStrategy(QtGui.QFont.PreferAntialias) metrics = QtGui.QFontMetrics(font) + width = getFontWidth(fontsize, metrics) top, bottom = getFontTopBottom(fontsize, metrics) extraImage = QtGui.QImage("fonts/extra_%dpx.png" % (fontsize+1))