Build the PSF fonts in the cross-compile

diff --git a/sys/msdos/fonts/makefont.lua b/sys/msdos/fonts/makefont.lua
index d5dafccc1b22cd6a63548e67062cbb11287ac55e..c953f6aae810d5476def858331049f6b6af26eb4 100755 (executable)
--- a/sys/msdos/fonts/makefont.lua
+++ b/sys/msdos/fonts/makefont.lua
@@ -209,4 +209,4 @@ for i = 1, next_pos-1 do
     outfile:write("\xFF")
 end
 
-outfile.close()
+outfile:close()

diff --git a/sys/msdos/fonts/ter-u16b.psf b/sys/msdos/fonts/ter-u16b.psf
deleted file mode 100644 (file)
index 83c6c19..0000000
Binary files a/sys/msdos/fonts/ter-u16b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u16v.psf b/sys/msdos/fonts/ter-u16v.psf
deleted file mode 100644 (file)
index 1256d1d..0000000
Binary files a/sys/msdos/fonts/ter-u16v.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u18b.psf b/sys/msdos/fonts/ter-u18b.psf
deleted file mode 100644 (file)
index 98e6111..0000000
Binary files a/sys/msdos/fonts/ter-u18b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u20b.psf b/sys/msdos/fonts/ter-u20b.psf
deleted file mode 100644 (file)
index abbf0db..0000000
Binary files a/sys/msdos/fonts/ter-u20b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u22b.psf b/sys/msdos/fonts/ter-u22b.psf
deleted file mode 100644 (file)
index d09cb01..0000000
Binary files a/sys/msdos/fonts/ter-u22b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u24b.psf b/sys/msdos/fonts/ter-u24b.psf
deleted file mode 100644 (file)
index 178c862..0000000
Binary files a/sys/msdos/fonts/ter-u24b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u28b.psf b/sys/msdos/fonts/ter-u28b.psf
deleted file mode 100644 (file)
index 7fa4d23..0000000
Binary files a/sys/msdos/fonts/ter-u28b.psf and /dev/null differ

diff --git a/sys/msdos/fonts/ter-u32b.psf b/sys/msdos/fonts/ter-u32b.psf
deleted file mode 100644 (file)
index 927313c..0000000
Binary files a/sys/msdos/fonts/ter-u32b.psf and /dev/null differ

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 7831606431e0bfe0fbc42c504e7c70e6ca066a33..802e9b7e3b940db45c7d21884ff094881ece1436 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -143,6 +143,10 @@ include/nhlua.h: $(TOPLUALIB)
 lib/lua-$(LUA_VERSION)/src/lua.h:
        @echo "Please do 'make fetch-lua' to obtain lua-$(LUA_VERSION)"
        @false
+luabin:
+       ( cd $(LUATOP) \
+         && make $(LUAMAKEFILES) all && cd $(LUA2NHTOP) )
+
 # hints file could set LUATESTTARGET to this if GITSUBMODULES is defined
 submodules/lua/lua.h:
        git submodule init submodules/lua

diff --git a/sys/unix/hints/include/cross-post.370 b/sys/unix/hints/include/cross-post.370
index 1e962b21dcef27ed62c92627255a515e58d62c2f..b6f701e9f1cf1a64df26eaa08cab4c26712f0825 100644 (file)
--- a/sys/unix/hints/include/cross-post.370
+++ b/sys/unix/hints/include/cross-post.370
@@ -24,9 +24,32 @@ $(TARGETPFX)exceptn.o : ../lib/djgpp/djgpp-patch/src/libc/go32/exceptn.S
 $(GAMEBIN) : $(HOBJ) $(LUACROSSLIB)
        $(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
        $(HOBJ) $(WINLIB) $(TARGET_LIBS)
+
+FONTDIR = ../sys/msdos/fonts
+$(FONTDIR)/ter-u16b.psf: $(FONTDIR)/ter-u16b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u16b.bdf $@
+$(FONTDIR)/ter-u16v.psf: $(FONTDIR)/ter-u16v.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u16v.bdf $@
+$(FONTDIR)/ter-u18b.psf: $(FONTDIR)/ter-u18b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u18b.bdf $@
+$(FONTDIR)/ter-u20b.psf: $(FONTDIR)/ter-u20b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u20b.bdf $@
+$(FONTDIR)/ter-u22b.psf: $(FONTDIR)/ter-u22b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u22b.bdf $@
+$(FONTDIR)/ter-u24b.psf: $(FONTDIR)/ter-u24b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u24b.bdf $@
+$(FONTDIR)/ter-u28b.psf: $(FONTDIR)/ter-u28b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u28b.bdf $@
+$(FONTDIR)/ter-u32b.psf: $(FONTDIR)/ter-u32b.bdf $(FONTDIR)/makefont.lua $(LUABIN)
+       $(LUABIN) $(FONTDIR)/makefont.lua $(FONTDIR)/ter-u32b.bdf $@
 #
-.PHONY: dospkg
-dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
+.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
        cp $(GAMEBIN) $(TARGETPFX)pkg/NETHACK.EXE
@@ -52,6 +75,12 @@ endif
        -touch $(TARGETPFX)pkg/RECORD
        cd $(TARGETPFX)pkg ; zip -9 ../NH370DOS.ZIP * ; cd ../../..
        @echo msdos package zip file $(TARGETPFX)NH370DOS.ZIP
+
+$(LUABIN):
+       ( cd .. && make luabin && cd src)
+dodata:
+       ( cd .. && make dlb && cd src)
+
 endif  # CROSS_TO_MSDOS
 
 ifdef CROSS_TO_WASM

diff --git a/sys/unix/hints/include/cross-pre.370 b/sys/unix/hints/include/cross-pre.370
index 68c4d3d53345251b3522dda17bb4026feca66c1a..a94909ef5e7337a7fadeb5c40856eae93d20cfd6 100644 (file)
--- a/sys/unix/hints/include/cross-pre.370
+++ b/sys/unix/hints/include/cross-pre.370
@@ -164,6 +164,11 @@ MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
 PDCINCL += -I$(PDCPORT)
 PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
                        -Wno-missing-prototypes
+FONTTARGETS = ../sys/msdos/fonts/ter-u16b.psf ../sys/msdos/fonts/ter-u16v.psf \
+               ../sys/msdos/fonts/ter-u18b.psf ../sys/msdos/fonts/ter-u20b.psf \
+               ../sys/msdos/fonts/ter-u22b.psf ../sys/msdos/fonts/ter-u24b.psf \
+               ../sys/msdos/fonts/ter-u28b.psf ../sys/msdos/fonts/ter-u32b.psf
+LUABIN = ../lib/lua-$(LUA_VERSION)/src/lua
 LUA_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS)
 override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations \
                        -Wmissing-prototypes -pedantic -Wmissing-declarations \
@@ -193,7 +198,7 @@ override TOPLUALIB=
 override GAMEBIN = $(TARGETPFX)nethack.exe
 override PACKAGE = dospkg
 override PREGAME += mkdir -p $(TARGETDIR) ; make $(TARGETPFX)exceptn.o ;
-override CLEANMORE += rm -f -r $(TARGETDIR) ;
+override CLEANMORE += rm -f -r $(TARGETDIR) ; rm -f -r $(FONTTARGETS) ;
 VARDATND += nhtiles.bmp
 #
 ifdef WANT_WIN_CURSES