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

update the msdos cross-compile

Browse Source 
date.c wasn't always being recompiled.
A couple of other bits.
This commit is contained in:
nhmall
2024-12-30 12:52:35 -05:00
parent a65c012f45
commit ac50b7fecc
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/hints/include/cross-post.370
+7 -3
View File
@@ -19,12 +19,16 @@ $(TARGETPFX)vidvesa.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \ $(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(HACK_H) $(HACK_H)
$(TARGETPFX)tile.o : tile.c $(TARGETPFX)tile.o : tile.c
ifeq "$(DOSSOUND)" "1"
#$(info DOSSOUND=$(DOSSOUND))
$(TARGETPFX)dossound.o: ../sound/dossound/dossound.c $(HACK_H)
endif
$(TARGETPFX)exceptn.o : ../lib/djgpp/djgpp-patch/src/libc/go32/exceptn.S $(TARGETPFX)exceptn.o : ../lib/djgpp/djgpp-patch/src/libc/go32/exceptn.S
$(TARGET_CC) -c -o $@ ../lib/djgpp/djgpp-patch/src/libc/go32/exceptn.S $(TARGET_CC) -c -o $@ ../lib/djgpp/djgpp-patch/src/libc/go32/exceptn.S
$(TARGET_AR) ru ../lib/djgpp/i586-pc-msdosdjgpp/lib/libc.a $(TARGETPFX)exceptn.o $(TARGET_AR) ru ../lib/djgpp/i586-pc-msdosdjgpp/lib/libc.a $(TARGETPFX)exceptn.o
$(GAMEBIN) : $(HOBJ) $(HACKLIB) $(LUACROSSLIB) $(GAMEBIN) : $(HOBJ) $(TARGETPFX)date.o $(TARGET_HACKLIB) $(LUACROSSLIB)
$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \ $(TARGET_LINK) $(TARGET_LFLAGS) -o $@ \
$(HOBJ) $(HACKLIB) $(WINLIB) $(TARGET_LIBS) $(HOBJ) $(TARGET_HACKLIB) $(WINLIB) $(TARGET_LIBS)
$(DOSFONT)/ter-u16b.psf: $(FONTTOP)/ter-u16b.bdf $(DOSFONT)/nh-u16b.bdf $(DOSFONT)/makefont.lua $(LUABIN) $(DOSFONT)/ter-u16b.psf: $(FONTTOP)/ter-u16b.bdf $(DOSFONT)/nh-u16b.bdf $(DOSFONT)/makefont.lua $(LUABIN)
$(LUABIN) $(DOSFONT)/makefont.lua $(FONTTOP)/ter-u16b.bdf $(DOSFONT)/nh-u16b.bdf $@ $(LUABIN) $(DOSFONT)/makefont.lua $(FONTTOP)/ter-u16b.bdf $(DOSFONT)/nh-u16b.bdf $@
$(DOSFONT)/ter-u16v.psf: $(FONTTOP)/ter-u16v.bdf $(DOSFONT)/nh-u16v.bdf $(DOSFONT)/makefont.lua $(LUABIN) $(DOSFONT)/ter-u16v.psf: $(FONTTOP)/ter-u16v.bdf $(DOSFONT)/nh-u16v.bdf $(DOSFONT)/makefont.lua $(LUABIN)
sys/unix/hints/include/cross-pre2.370
+5 -4
View File
@@ -35,7 +35,8 @@ LUACROSSLIB = $(TARGETPFX)lua$(subst .,,$(LUA_VERSION)).a
LUAINCL = -I$(LUASRCDIR) LUAINCL = -I$(LUASRCDIR)
override BUILDMORE += $(LUACROSSLIB) override BUILDMORE += $(LUACROSSLIB)
override CLEANMORE += rm -f $(LUACROSSLIB) ; override CLEANMORE += rm -f $(LUACROSSLIB) ;
override TARGET_LIBS += $(LUACROSSLIB) -lm override TARGET_LIBS += $(LUACROSSLIB)
LIBLM = -lm
else else
LUAINCL= LUAINCL=
endif # BUILD_TARGET_LUA endif # BUILD_TARGET_LUA
@@ -178,12 +179,12 @@ MSDOS_TARGET_CFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/sha
$(LUAINCL) -DDLB $(PDCURSESDEF) -DTILES_IN_GLYPHMAP \ $(LUAINCL) -DDLB $(PDCURSESDEF) -DTILES_IN_GLYPHMAP \
-DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \ -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
-D_NAIVE_DOS_REGS \ -D_NAIVE_DOS_REGS \
$(MSDOS_GCC_CFLAGS) $(MSDOS_GCC_CFLAGS) $(SNDCFLAGS)
MSDOS_TARGET_CXXFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/share \ MSDOS_TARGET_CXXFLAGS = -c -O $(DBGFLAGS) -I../include -I../sys/msdos -I../win/share \
$(LUAINCL) -DDLB $(PDCURSESDEF) \ $(LUAINCL) -DDLB $(PDCURSESDEF) \
-DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \ -DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
-D_NAIVE_DOS_REGS \ -D_NAIVE_DOS_REGS \
$(MSDOS_GPP_CFLAGS) $(MSDOS_GPP_CFLAGS) $(SNDCFLAGS)
PDCINCL += -I$(PDCPORT) PDCINCL += -I$(PDCPORT)
PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \ PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
-Wno-missing-prototypes -Wno-missing-prototypes
@@ -204,7 +205,7 @@ else
override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
endif endif
override TARGET_LFLAGS= override TARGET_LFLAGS=
override TARGET_LIBS += -lpc override TARGET_LIBS += -lpc $(LIBLM)
override SYSSRC = ../sys/share/pcmain.c ../sys/msdos/msdos.c \ override SYSSRC = ../sys/share/pcmain.c ../sys/msdos/msdos.c \
../sys/share/pcsys.c ../sys/share/pctty.c \ ../sys/share/pcsys.c ../sys/share/pctty.c \
../sys/share/pcunix.c ../sys/msdos/video.c \ ../sys/share/pcunix.c ../sys/msdos/video.c \