folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BESM6: Cleanup for build on OS X,

Browse source
This commit is contained in:
Mark Pizzolato 2015-01-06 19:20:36 -08:00 • committed by Leo Broukhis
parent 5fd8b63cf4
commit 0f1e233366
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BESM6/besm6_tty.c
View file

@ -443,7 +443,7 @@ void vt_putc (int num, int c)
/* /*
* Sending a string to a terminal with the given number. * Sending a string to a terminal with the given number.
*/ */
void vt_puts (int num, const unsigned char *s) void vt_puts (int num, const char *s)
{ {
TMLN *t = &tty_line [num]; TMLN *t = &tty_line [num];

14
makefile
View file

@ -68,7 +68,7 @@ ifneq (,$(or $(findstring pdp11,$(MAKECMDGOALS)),$(findstring vax,$(MAKECMDGOALS
VIDEO_USEFUL = true VIDEO_USEFUL = true
DISPLAY_USEFUL = true DISPLAY_USEFUL = true
endif endif
else ifeq ($(MAKECMDGOALS),besm6) else ifneq (,$(findstring besm6,$(MAKECMDGOALS)))
VIDEO_USEFUL = true VIDEO_USEFUL = true
else else
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
@ -300,8 +300,8 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
endif endif
$(info lib paths are: $(LIBPATH)) $(info lib paths are: $(LIBPATH))
$(info include paths are: $(INCPATH)) $(info include paths are: $(INCPATH))
find_lib = $(strip $(firstword $(foreach dir,$(strip $(LIBPATH)),$(wildcard $(dir)/lib$(1).$(LIBEXT))))) find_lib = $(abspath $(strip $(firstword $(foreach dir,$(strip $(LIBPATH)),$(wildcard $(dir)/lib$(1).$(LIBEXT))))))
find_include = $(strip $(firstword $(foreach dir,$(strip $(INCPATH)),$(wildcard $(dir)/$(1).h)))) find_include = $(abspath $(strip $(firstword $(foreach dir,$(strip $(INCPATH)),$(wildcard $(dir)/$(1).h)))))
need_search = $(strip $(shell ld -l$(1) /dev/null 2>&1 | grep $(1) | sed s/$(1)//)) need_search = $(strip $(shell ld -l$(1) /dev/null 2>&1 | grep $(1) | sed s/$(1)//))
LD_SEARCH_NEEDED := $(call need_search,ZzzzzzzZ) LD_SEARCH_NEEDED := $(call need_search,ZzzzzzzZ)
ifneq (,$(call find_lib,m)) ifneq (,$(call find_lib,m))
@ -1173,17 +1173,19 @@ BESM6 = ${BESM6D}/besm6_cpu.c ${BESM6D}/besm6_sys.c ${BESM6D}/besm6_mmu.c \
ifneq (,${VIDEO_LDFLAGS}) ifneq (,${VIDEO_LDFLAGS})
ifeq (,${FONTFILE}) ifeq (,${FONTFILE})
FONTPATH += /usr/share/fonts /usr/share/fonts/truetype /usr/lib/jvm /System/Library/Frameworks/JavaVM.framework/Versions 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 += LucidaSansRegular.ttf FreeSans.ttf
$(info font paths are: $(FONTPATH)) $(info font paths are: $(FONTPATH))
$(info font names are: $(FONTNAME)) $(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))))) find_fontfile = $(strip $(firstword $(foreach dir,$(strip $(FONTPATH)),$(wildcard $(dir)/$(1))$(wildcard $(dir)/*/$(1))$(wildcard $(dir)/*/*/$(1))$(wildcard $(dir)/*/*/*/$(1)))))
find_font = $(strip $(firstword $(foreach font,$(strip $(FONTNAME)),$(call find_fontfile,$(font))))) find_font = $(abspath $(strip $(firstword $(foreach font,$(strip $(FONTNAME)),$(call find_fontfile,$(font))))))
ifneq (,$(call find_font)) ifneq (,$(call find_font))
FONTFILE=$(call find_font) FONTFILE=$(call find_font)
else else
$(info ***) $(info ***)
$(info *** BESM-6 video panel disabled.) $(info *** No font file available, BESM-6 video panel disabled.)
$(info ***)
$(info *** To enable the panel display please specify one of:) $(info *** To enable the panel display please specify one of:)
$(info *** a font path with FONTNAME=path) $(info *** a font path with FONTNAME=path)
$(info *** a font name with FONTNAME=fontname.ttf) $(info *** a font name with FONTNAME=fontname.ttf)