MS-DOS: Support no-tiles and no-graphics builds

In previous versions of NetHack, setting -DUSE_TILES enabled the tile
support, while setting -DSUPPRESS_GRAPHICS produced a NetHack that
would write its TTY output to standard output, and rely on ANSI.SYS or
similar to do screen control. (USE_TILES is now TILES_IN_GLYPHMAP.)

This change ensures that the current NetHack can be built the same
ways.

One twist is that previous NetHacks would drop all support for graphical
modes when tiles were not supported. Thus sys/msdos/vid{vga,vesa}.c have
very disordered use of TILES_IN_GLYPHMAP. There was no need to check
this. But now, the graphical modes also support Unicode. A non-tiled
build should have the graphical modes, with only the text functions
present, provided that ENHANCED_SYMBOLS is defined.

Some unused and locally used symbols were cleaned up along the way.

sys/unix/hints/include/cross-post.500

@@ -50,7 +50,7 @@ $(DOSFONT)/ter-u32b.psf: $(FONTTOP)/ter-u32b.bdf $(DOSFONT)/nh-u32b.bdf $(DOSFON
 #
 .PHONY: dodata dospkg dosfonts
 dosfonts: $(FONTTARGETS)
-dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
+dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe $(NHTILES)
 	$(TARGET_STUBEDIT) $(GAMEBIN) minstack=2048K
 	mkdir -p $(TARGETPFX)pkg
 	cp $(GAMEBIN) $(TARGETPFX)pkg/NETHACK.EXE
@@ -58,7 +58,7 @@ dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
 	-cp $(SFCTOOLBIN) $(TARGETPFX)pkg/SFCTOOL.EXE
 	cp ../dat/nhdat $(TARGETPFX)pkg/NHDAT
 	cp ../dat/license $(TARGETPFX)pkg/LICENSE
-	cp ../dat/nhtiles.bmp $(TARGETPFX)pkg/NHTILES.BMP
+	-cp ../dat/nhtiles.bmp $(TARGETPFX)pkg/NHTILES.BMP
 	cp ../dat/symbols $(TARGETPFX)pkg/SYMBOLS
 	cp ../sys/share/NetHack.cnf $(TARGETPFX)pkg/NETHACK.CNF
 	cp ../sys/msdos/sysconf $(TARGETPFX)pkg/SYSCONF

sys/unix/hints/include/cross-pre2.500

@@ -177,8 +177,23 @@ MSDOS_GPP_CFLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type \
 	-Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings -pedantic \
 	-Wmissing-declarations -Wformat-nonliteral -Wunreachable-code \
 	-Wno-maybe-uninitialized
+ifdef NO_GRAPHICS
+    MSDOS_GRAPH_CONFIG = -DSUPPRESS_GRAPHICS
+    # Curses will need the fonts, but not font.c
+    ifndef WANT_DOSVGA
+        SKIP_FONTS = 1
+    endif
+    SKIP_FONT_C = 1
+    SKIP_TILES = 1
+else ifdef NO_TILES
+    MSDOS_GRAPH_CONFIG =
+    # without SKIP_FONT_C; if ENHANCED_SYMBOLS is set, we'll need the fonts
+    SKIP_TILES = 1
+else
+    MSDOS_GRAPH_CONFIG = -DTILES_IN_GLYPHMAP
+endif
 MSDOS_TARGET_CFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/share \
-	$(LUAINCL) -DDLB $(PDCURSESDEF) -DTILES_IN_GLYPHMAP \
+	$(LUAINCL) -DDLB $(PDCURSESDEF) $(MSDOS_GRAPH_CONFIG) \
 	-DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
 	-D_NAIVE_DOS_REGS \
 	$(MSDOS_GCC_CFLAGS) $(SNDCFLAGS)
@@ -190,7 +205,11 @@ MSDOS_TARGET_CXXFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/s
 PDCINCL += -I$(PDCPORT)
 PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
 			-Wno-missing-prototypes
-ifndef SKIP_FONTS_IN_CI
+ifdef SKIP_FONTS_IN_CI
+FONTTARGETS=
+else ifdef SKIP_FONTS
+FONTTARGETS=
+else
 FONTVER = terminus-font-4.49.1
 FONTTOP = ../lib/$(FONTVER)
 DOSFONT = ../sys/msdos/fonts
@@ -198,8 +217,6 @@ FONTTARGETS = $(DOSFONT)/ter-u16b.psf $(DOSFONT)/ter-u16v.psf \
 		$(DOSFONT)/ter-u18b.psf $(DOSFONT)/ter-u20b.psf \
 		$(DOSFONT)/ter-u22b.psf $(DOSFONT)/ter-u24b.psf \
 		$(DOSFONT)/ter-u28b.psf $(DOSFONT)/ter-u32b.psf
-else
-FONTTARGETS=
 endif
 LUABIN = ../lib/lua-$(LUA_VERSION)/src/lua
 LUA_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS)
@@ -216,18 +233,22 @@ override SYSSRC = ../sys/share/pcmain.c ../sys/msdos/msdos.c \
 		../sys/share/pcsys.c ../sys/share/pctty.c \
 		../sys/share/pcunix.c ../sys/msdos/video.c \
 		../sys/msdos/vidtxt.c ../sys/msdos/pckeys.c \
-		../sys/msdos/vidvga.c ../sys/msdos/vidvesa.c \
-		../sys/msdos/font.c \
-		../win/share/bmptiles.c ../win/share/giftiles.c \
-		../win/share/tileset.c
+		../sys/msdos/vidvga.c ../sys/msdos/vidvesa.c
 override SYSOBJ= $(TARGETPFX)pcmain.o $(TARGETPFX)msdos.o \
 		$(TARGETPFX)pcsys.o $(TARGETPFX)pctty.o \
 		$(TARGETPFX)pcunix.o $(TARGETPFX)video.o \
 		$(TARGETPFX)vidtxt.o $(TARGETPFX)pckeys.o \
-		$(TARGETPFX)vidvga.o $(TARGETPFX)vidvesa.o \
-		$(TARGETPFX)font.o \
-		$(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o \
+		$(TARGETPFX)vidvga.o $(TARGETPFX)vidvesa.o
+ifndef SKIP_FONT_C
+override SYSSRC += ../sys/msdos/font.c
+override SYSOBJ += $(TARGETPFX)font.o
+endif
+ifndef SKIP_TILES
+override SYSSRC += ../win/share/bmptiles.c ../win/share/giftiles.c \
+		../win/share/tileset.c
+override SYSOBJ += $(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o \
 		$(TARGETPFX)tileset.o
+endif
 override WINLIB=
 override LUALIB=
 override LUALIBS=
@@ -250,7 +271,12 @@ GDBEXE=
 GDBBAT=
 GDBCMDLINE=
 endif
+ifndef SKIP_TILES
 VARDATND += nhtiles.bmp
+NHTILES = ../dat/nhtiles.bmp
+else
+NHTILES =
+endif
 #
 ifdef WANT_WIN_CURSES
 # rules for pdcurses dos-specific files