nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Build the PSF fonts in the cross-compile

Browse Source
This commit is contained in:
Ray Chason
2022-10-03 20:22:11 -04:00
parent 176e94d1b9
commit daf18eac91
12 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sys/unix/hints/include/cross-post.370
View File

@@ -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

7
sys/unix/hints/include/cross-pre.370
View File

@@ -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