]> granicus.if.org Git - nethack/commitdiff
Always compile the Terminus fonts
authorRay Chason <Ray Chason>
Sun, 9 Oct 2022 06:53:52 +0000 (02:53 -0400)
committerRay Chason <Ray Chason>
Sun, 9 Oct 2022 06:53:52 +0000 (02:53 -0400)
sys/unix/hints/include/cross-post.370

index c530bc07063f2a1d6a0b966fda71de11f67e14e9..693f7c9c49fd7eb9719aebbff06d915f0d68a109 100644 (file)
@@ -43,11 +43,7 @@ $(FONTDIR)/ter-u32b.psf: $(FONTTOP)/ter-u32b.bdf $(FONTDIR)/makefont.lua $(LUABI
        $(LUABIN) $(FONTDIR)/makefont.lua $(FONTTOP)/ter-u32b.bdf $@
 #
 .PHONY: dodata dospkg dosfonts
-ifdef WANT_DOSVGA
 dosfonts: $(FONTTARGETS)
-else
-dosfonts:
-endif
 dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
        $(TARGET_STUBEDIT) $(GAMEBIN) minstack=2048K
        mkdir -p $(TARGETPFX)pkg
@@ -60,7 +56,6 @@ dospkg: dodata dosfonts $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
        cp ../sys/share/NetHack.cnf $(TARGETPFX)pkg/NETHACK.CNF
        cp ../sys/msdos/sysconf $(TARGETPFX)pkg/SYSCONF
        cp ../doc/nethack.txt $(TARGETPFX)pkg/NETHACK.TXT
-ifdef WANT_DOSVGA
        cp ../sys/msdos/fonts/ter-u16b.psf $(TARGETPFX)pkg/TER-U16B.PSF
        cp ../sys/msdos/fonts/ter-u16v.psf $(TARGETPFX)pkg/TER-U16V.PSF
        cp ../sys/msdos/fonts/ter-u18b.psf $(TARGETPFX)pkg/TER-U18B.PSF
@@ -69,7 +64,6 @@ ifdef WANT_DOSVGA
        cp ../sys/msdos/fonts/ter-u24b.psf $(TARGETPFX)pkg/TER-U24B.PSF
        cp ../sys/msdos/fonts/ter-u28b.psf $(TARGETPFX)pkg/TER-U28B.PSF
        cp ../sys/msdos/fonts/ter-u32b.psf $(TARGETPFX)pkg/TER-U32B.PSF
-endif
        cp  ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETPFX)pkg/CWSDPMI.EXE
        -touch $(TARGETPFX)pkg/RECORD
        cd $(TARGETPFX)pkg ; zip -9 ../NH370DOS.ZIP * ; cd ../../..