From e599afcd689a450bf92e8e3de628a0f3ca36cf27 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 10 Sep 2022 08:42:23 -0700
Subject: [PATCH] BESM6: Cleanup makefile and Visual Studio build support

- Avoid explicit search for font file (which is now done at runtime
  activation of the display panel)
- Retain ability for FONTFILE to be explicitly specified on the make command
---
 Visual Studio Projects/BESM6.vcproj |   4 +-
 makefile                            | 138 ++++++++++------------------
 2 files changed, 48 insertions(+), 94 deletions(-)

diff --git a/Visual Studio Projects/BESM6.vcproj b/Visual Studio Projects/BESM6.vcproj
index faa5a226..c7b47578 100644
--- a/Visual Studio Projects/BESM6.vcproj	
+++ b/Visual Studio Projects/BESM6.vcproj	
@@ -26,7 +26,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Check for required build dependencies, git commit id and required Font File"
-				CommandLine="Pre-Build-Event.cmd &quot;$(TargetDir)$(TargetName).exe&quot; LIBPCRE LIBSDL FINDFONT tahoma.ttf besm6_panel_font.h"
+				CommandLine="Pre-Build-Event.cmd &quot;$(TargetDir)$(TargetName).exe&quot; LIBPCRE LIBSDL"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -107,7 +107,7 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 				Description="Check for required build dependencies, git commit id and required Font File"
-				CommandLine="Pre-Build-Event.cmd &quot;$(TargetDir)$(TargetName).exe&quot; LIBPCRE LIBSDL FINDFONT tahoma.ttf besm6_panel_font.h"
+				CommandLine="Pre-Build-Event.cmd &quot;$(TargetDir)$(TargetName).exe&quot; LIBPCRE LIBSDL"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
diff --git a/makefile b/makefile
index 763a0597..878ffe90 100644
--- a/makefile
+++ b/makefile
@@ -649,12 +649,8 @@ ifeq (${WIN32},)  #*nix Environments (&& cygwin)
     endif
     ifneq (,$(call find_include,SDL2/SDL))
       ifneq (,$(call find_lib,SDL2))
-        ifneq (,$(findstring Haiku,$(OSTYPE)))
-          ifneq (,$(shell which sdl2-config))
-            SDLX_CONFIG = sdl2-config
-          endif
-        else
-          SDLX_CONFIG = $(realpath $(dir $(call find_include,SDL2/SDL))../../bin/sdl2-config)
+        ifneq (,$(shell which sdl2-config))
+          SDLX_CONFIG = sdl2-config
         endif
         ifneq (,$(SDLX_CONFIG))
           VIDEO_CCDEFS += -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(SDLX_CONFIG) --cflags`
@@ -715,6 +711,49 @@ ifeq (${WIN32},)  #*nix Environments (&& cygwin)
         endif
       endif
       $(info *** Info ***)
+    else
+      ifneq (,$(BESM6_BUILD))
+        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))
+          $(info ***)
+          VIDEO_TTF_OPT = $(filter-out -DSDL_MAIN_AVAILABLE,$(VIDEO_CCDEFS)) ${VIDEO_LDFLAGS} -lSDL2_ttf
+          VIDEO_FEATURES += with TrueType font support
+          # Retain support for explicitly supplying a preferred fontfile
+          ifneq (,$(FONTFILE))
+            VIDEO_TTF_OPT +=  -DFONTFILE=${FONTFILE}
+          endif
+        else
+          $(info *** No SDL ttf support available.  BESM-6 video panel disabled.)
+          $(info ***)
+          ifeq (Darwin,$(OSTYPE))
+            ifeq (/opt/local/bin/port,$(shell which port))
+              $(info *** Info *** Install the MacPorts libSDL2-ttf development package to provide this)
+              $(info *** Info *** functionality for your OS X system:)
+              $(info *** Info ***       # port install libsdl2-ttf-dev)
+            endif
+            ifeq (/usr/local/bin/brew,$(shell which brew))
+              ifeq (/opt/local/bin/port,$(shell which port))
+                $(info *** Info ***)
+                $(info *** Info *** OR)
+                $(info *** Info ***)
+              endif
+              $(info *** Info *** Install the HomeBrew sdl2_ttf package to provide this)
+              $(info *** Info *** functionality for your OS X system:)
+              $(info *** Info ***       $$ brew install sdl2_ttf)
+            endif
+          else
+            ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get)))
+              $(info *** Info *** Install the development components of libSDL2-ttf)
+              $(info *** Info *** packaged for your Linux operating system distribution:)
+              $(info *** Info ***        $$ sudo apt-get install libsdl2-ttf-dev)
+            else
+              $(info *** Info *** Install the development components of libSDL2-ttf packaged by your)
+              $(info *** Info *** operating system distribution and rebuild your simulator to)
+              $(info *** Info *** enable this extra functionality.)
+            endif
+          endif
+        endif
+      endif
     endif
   endif
   ifneq (,$(NETWORK_USEFUL))
@@ -1896,92 +1935,7 @@ 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_pl.c ${BESM6D}/besm6_mg.c \
         ${BESM6D}/besm6_punch.c ${BESM6D}/besm6_punchcard.c ${BESM6D}/besm6_vu.c
-
-ifneq (,$(BESM6_BUILD))
-    BESM6_OPT = -I ${BESM6D} -DUSE_INT64 $(BESM6_PANEL_OPT)
-    ifneq (,$(and ${SDLX_CONFIG},${VIDEO_LDFLAGS}, $(or $(and $(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
-#cmake-insert:set(BESM6_FONT)
-#cmake-insert:foreach (fdir IN ITEMS
-#cmake-insert:            "/usr/share/fonts" "/Library/Fonts" "/usr/lib/jvm"
-#cmake-insert:            "/System/Library/Frameworks/JavaVM.framework/Versions"
-#cmake-insert:            "$ENV{WINDIR}/Fonts")
-#cmake-insert:    foreach (font IN ITEMS
-#cmake-insert:                "DejaVuSans.ttf" "LucidaSansRegular.ttf" "FreeSans.ttf" "AppleGothic.ttf" "tahoma.ttf")
-#cmake-insert:        if (EXISTS ${fdir})
-#cmake-insert:            file(GLOB_RECURSE found_font ${fdir}/${font})
-#cmake-insert:            if (found_font)
-#cmake-insert:                get_filename_component(fontfile ${found_font} ABSOLUTE)
-#cmake-insert:                list(APPEND BESM6_FONT ${fontfile})
-#cmake-insert:            endif ()
-#cmake-insert:        endif ()
-#cmake-insert:    endforeach()
-#cmake-insert:endforeach()
-#cmake-insert:
-#cmake-insert:if (NOT BESM6_FONT)
-#cmake-insert:    message("No font file available, BESM-6 video panel disabled")
-#cmake-insert:    set(BESM6_PANEL_OPT)
-#cmake-insert:endif ()
-#cmake-insert:
-#cmake-insert:if (BESM6_FONT AND WITH_VIDEO)
-#cmake-insert:    list(GET BESM6_FONT 0 BESM6_FONT)
-#cmake-insert:endif ()
-        $(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)))))
-        find_font = $(abspath $(strip $(firstword $(foreach font,$(strip $(FONTNAME)),$(call find_fontfile,$(font))))))
-        ifneq (,$(call find_font))
-            FONTFILE=$(call find_font)
-        else
-            $(info ***)
-            $(info *** No font file available, BESM-6 video panel disabled.)
-            $(info ***)
-            $(info *** To enable the panel display please specify one of:)
-            $(info ***          a font path with FONTPATH=path)
-            $(info ***          a font name with FONTNAME=fontname.ttf)
-            $(info ***          a font file with FONTFILE=path/fontname.ttf)
-            $(info ***)
-        endif
-    endif
-    ifeq (,$(and ${VIDEO_LDFLAGS}, ${FONTFILE}, $(BESM6_BUILD)))
-        $(info *** No SDL ttf support available.  BESM-6 video panel disabled.)
-        $(info ***)
-        ifeq (Darwin,$(OSTYPE))
-          ifeq (/opt/local/bin/port,$(shell which port))
-            $(info *** Info *** Install the MacPorts libSDL2-ttf development package to provide this)
-            $(info *** Info *** functionality for your OS X system:)
-            $(info *** Info ***       # port install libsdl2-ttf-dev)
-          endif
-          ifeq (/usr/local/bin/brew,$(shell which brew))
-            ifeq (/opt/local/bin/port,$(shell which port))
-              $(info *** Info ***)
-              $(info *** Info *** OR)
-              $(info *** Info ***)
-            endif
-            $(info *** Info *** Install the HomeBrew sdl2_ttf package to provide this)
-            $(info *** Info *** functionality for your OS X system:)
-            $(info *** Info ***       $$ brew install sdl2_ttf)
-          endif
-        else
-          ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get)))
-            $(info *** Info *** Install the development components of libSDL2-ttf)
-            $(info *** Info *** packaged for your Linux operating system distribution:)
-            $(info *** Info ***        $$ sudo apt-get install libsdl2-ttf-dev)
-          else
-            $(info *** Info *** Install the development components of libSDL2-ttf packaged by your)
-            $(info *** Info *** operating system distribution and rebuild your simulator to)
-            $(info *** Info *** enable this extra functionality.)
-          endif
-        endif
-        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))
-        $(info ***)
-        BESM6_PANEL_OPT = -DFONTFILE=${FONTFILE} ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf
-    endif
-endif
+BESM6_OPT = -I ${BESM6D} -DUSE_INT64 $(VIDEO_TTF_OPT)
 
 PDP6D = ${SIMHD}/PDP10
 ifneq (,${DISPLAY_OPT})