1
0
mirror of https://github.com/simh/simh.git synced 2026-04-15 16:11:13 +00:00

BESM6: Output to Baudot TTYs works; fixed attaching of disks without -e; added DejaVu font option.

This commit is contained in:
Leo Broukhis
2015-01-07 02:03:32 -08:00
parent 0f1e233366
commit d6d13a8c08
5 changed files with 15 additions and 10 deletions

View File

@@ -1175,7 +1175,7 @@ ifneq (,${VIDEO_LDFLAGS})
ifeq (,${FONTFILE})
FONTPATH += /usr/share/fonts /Library/Fonts /usr/lib/jvm /System/Library/Frameworks/JavaVM.framework/Versions
FONTPATH := $(dir $(foreach dir,$(strip $(FONTPATH)),$(wildcard $(dir)/.)))
FONTNAME += LucidaSansRegular.ttf FreeSans.ttf
FONTNAME += DejaVuSans.ttf LucidaSansRegular.ttf FreeSans.ttf
$(info font paths are: $(FONTPATH))
$(info font names are: $(FONTNAME))
find_fontfile = $(strip $(firstword $(foreach dir,$(strip $(FONTPATH)),$(wildcard $(dir)/$(1))$(wildcard $(dir)/*/$(1))$(wildcard $(dir)/*/*/$(1))$(wildcard $(dir)/*/*/*/$(1)))))