From fa292f59cdfc1c8ec5e54e88d11ff56795f3941b Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 14 Sep 2016 17:30:46 -0700 Subject: [PATCH] makefile: Add logic to BESM6 build warning that video panel needs SDL --- makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index b3c1f37d..afa28be5 100644 --- a/makefile +++ b/makefile @@ -1383,8 +1383,8 @@ BESM6 = ${BESM6D}/besm6_cpu.c ${BESM6D}/besm6_sys.c ${BESM6D}/besm6_mmu.c \ ${BESM6D}/besm6_tty.c ${BESM6D}/besm6_panel.c ${BESM6D}/besm6_printer.c \ ${BESM6D}/besm6_punch.c -ifneq (,$(and ${VIDEO_LDFLAGS}, $(BESM6_BUILD))) - ifeq (,${FONTFILE}) +ifneq (,$(BESM6_BUILD)) + ifneq (,$(and ${VIDEO_LDFLAGS}, $(or $(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)), $(and $(call find_include,SDL/SDL_ttf),$(call find_lib,SDL_ttf))))) FONTPATH += /usr/share/fonts /Library/Fonts /usr/lib/jvm /System/Library/Frameworks/JavaVM.framework/Versions C:/Windows/Fonts FONTPATH := $(dir $(foreach dir,$(strip $(FONTPATH)),$(wildcard $(dir)/.))) FONTNAME += DejaVuSans.ttf LucidaSansRegular.ttf FreeSans.ttf AppleGothic.ttf tahoma.ttf @@ -1406,7 +1406,9 @@ ifneq (,$(and ${VIDEO_LDFLAGS}, $(BESM6_BUILD))) endif endif endif -ifeq (,$(and ${VIDEO_LDFLAGS}, ${FONTFILE})) +ifeq (,$(and ${VIDEO_LDFLAGS}, ${FONTFILE}, $(BESM6_BUILD))) + $(info *** No SDL ttf support available. BESM-6 video panel disabled.) + $(info ***) BESM6_OPT = -I ${BESM6D} -DUSE_INT64 else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf))) $(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf))