follow-up bit

break into TARGETDIR and TARGETPFX
This commit is contained in:
nhmall
2020-09-28 18:19:20 -04:00
parent 5eada896e2
commit 4b58cfd201
2 changed files with 231 additions and 229 deletions

View File

@@ -5,56 +5,56 @@
ifdef CROSS_TO_MSDOS
#
$(TARGETDIR)/msdos.o : ../sys/msdos/msdos.c $(HACK_H)
$(TARGETDIR)/pckeys.o : ../sys/msdos/pckeys.c $(HACK_H)
$(TARGETDIR)/pctiles.o : ../sys/msdos/pctiles.c ../sys/msdos/portio.h $(HACK_H)
$(TARGETDIR)/video.o : ../sys/msdos/video.c ../sys/msdos/portio.h $(HACK_H)
$(TARGETDIR)/vidtxt.o : ../sys/msdos/vidtxt.c ../sys/msdos/portio.h \
$(TARGETPFX)msdos.o : ../sys/msdos/msdos.c $(HACK_H)
$(TARGETPFX)pckeys.o : ../sys/msdos/pckeys.c $(HACK_H)
$(TARGETPFX)pctiles.o : ../sys/msdos/pctiles.c ../sys/msdos/portio.h $(HACK_H)
$(TARGETPFX)video.o : ../sys/msdos/video.c ../sys/msdos/portio.h $(HACK_H)
$(TARGETPFX)vidtxt.o : ../sys/msdos/vidtxt.c ../sys/msdos/portio.h \
../win/share/tile.h ../include/tileset.h $(HACK_H)
$(TARGETDIR)/vidvga.o : ../sys/msdos/vidvga.c ../sys/msdos/portio.h \
$(TARGETPFX)vidvga.o : ../sys/msdos/vidvga.c ../sys/msdos/portio.h \
../win/share/tile.h ../include/tileset.h $(HACK_H)
$(TARGETDIR)/vidvesa.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(TARGETPFX)vidvesa.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
../win/share/tile.h ../include/tileset.h $(HACK_H)
$(TARGETDIR)/vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
$(HACK_H)
$(TARGETDIR)/tile.o : tile.c
$(TARGETPFX)tile.o : tile.c
#
#.PHONY: dospkg
dospkg: $(GAMEBIN) $(TARGETDIR)/recover.exe ../dat/nhtiles.bmp
dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
$(TARGET_STUBEDIT) $(GAMEBIN) minstack=2048K
mkdir -p $(TARGETDIR)/pkg
cp $(GAMEBIN) $(TARGETDIR)/pkg/NETHACK.EXE
cp ../dat/nhdat $(TARGETDIR)/pkg/NHDAT
cp ../dat/license $(TARGETDIR)/pkg/LICENSE
cp ../dat/nhtiles.bmp $(TARGETDIR)/pkg/NHTILES.BMP
cp ../dat/symbols $(TARGETDIR)/pkg/SYMBOLS
cp ../sys/share/NetHack.cnf $(TARGETDIR)/pkg/NETHACK.CNF
cp ../sys/msdos/sysconf $(TARGETDIR)/pkg/SYSCONF
cp ../doc/nethack.txt $(TARGETDIR)/pkg/NETHACK.TXT
cp ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETDIR)/pkg/CWSDPMI.EXE
-touch $(TARGETDIR)/pkg/RECORD
zip -9 $(TARGETDIR)/NH370DOS.ZIP $(TARGETDIR)/pkg/*
@echo msdos package zip file $(TARGETDIR)/NH370DOS.ZIP
mkdir -p $(TARGETPFX)pkg
cp $(GAMEBIN) $(TARGETPFX)pkg/NETHACK.EXE
cp ../dat/nhdat $(TARGETPFX)pkg/NHDAT
cp ../dat/license $(TARGETPFX)pkg/LICENSE
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
cp ../doc/nethack.txt $(TARGETPFX)pkg/NETHACK.TXT
cp ../lib/djgpp/cwsdpmi/bin/CWSDPMI.EXE $(TARGETPFX)pkg/CWSDPMI.EXE
-touch $(TARGETPFX)pkg/RECORD
zip -9 $(TARGETPFX)NH370DOS.ZIP $(TARGETPFX)pkg/*
@echo msdos package zip file $(TARGETPFX)NH370DOS.ZIP
endif # CROSS_TO_MSDOS
ifdef CROSS_TO_AMIGA
$(TARGETDIR)/amidos.o : ../outdated/sys/amiga/amidos.c $(HACK_H)
$(TARGETDIR)/amigst.o : ../outdated/sys/amiga/amigst.c $(HACK_H)
$(TARGETDIR)/amirip.o : ../outdated/sys/amiga/amirip.c $(HACK_H)
$(TARGETDIR)/amistack.o : ../outdated/sys/amiga/amistack.c $(HACK_H)
$(TARGETDIR)/amitty.o : ../outdated/sys/amiga/amitty.c $(HACK_H)
$(TARGETDIR)/amiwind.o : ../outdated/sys/amiga/amiwind.c \
$(TARGETPFX)amidos.o : ../outdated/sys/amiga/amidos.c $(HACK_H)
$(TARGETPFX)amigst.o : ../outdated/sys/amiga/amigst.c $(HACK_H)
$(TARGETPFX)amirip.o : ../outdated/sys/amiga/amirip.c $(HACK_H)
$(TARGETPFX)amistack.o : ../outdated/sys/amiga/amistack.c $(HACK_H)
$(TARGETPFX)amitty.o : ../outdated/sys/amiga/amitty.c $(HACK_H)
$(TARGETPFX)amiwind.o : ../outdated/sys/amiga/amiwind.c \
../outdated/sys/amiga/amimenu.c $(HACK_H)
$(TARGETDIR)/winami.o : ../outdated/sys/amiga/winami.c $(HACK_H)
$(TARGETDIR)/winchar.o : ../outdated/sys/amiga/winchar.c tile.c $(HACK_H)
$(TARGETDIR)/winfuncs.o : ../outdated/sys/amiga/winfuncs.c $(HACK_H)
$(TARGETDIR)/winkey.o : ../outdated/sys/amiga/winkey.c $(HACK_H)
$(TARGETDIR)/winamenu.o : ../outdated/sys/amiga/winamenu.c $(HACK_H)
$(TARGETDIR)/winreq.o : ../outdated/sys/amiga/winreq.c \
$(TARGETPFX)winami.o : ../outdated/sys/amiga/winami.c $(HACK_H)
$(TARGETPFX)winchar.o : ../outdated/sys/amiga/winchar.c tile.c $(HACK_H)
$(TARGETPFX)winfuncs.o : ../outdated/sys/amiga/winfuncs.c $(HACK_H)
$(TARGETPFX)winkey.o : ../outdated/sys/amiga/winkey.c $(HACK_H)
$(TARGETPFX)winamenu.o : ../outdated/sys/amiga/winamenu.c $(HACK_H)
$(TARGETPFX)winreq.o : ../outdated/sys/amiga/winreq.c \
../outdated/sys/amiga/colorwin.c \
../outdated/sys/amiga/clipwin.c $(HACK_H)
$(TARGETDIR)/winstr.o : ../outdated/sys/amiga/winstr.c $(HACK_H)
$(TARGETDIR)/tomb.iff : ../util/xpm2iff ../outdated/sys/amiga/gave16.xpm
$(TARGETPFX)winstr.o : ../outdated/sys/amiga/winstr.c $(HACK_H)
$(TARGETPFX)tomb.iff : ../util/xpm2iff ../outdated/sys/amiga/gave16.xpm
../util/tiletext.o : ../win/share/tiletext.c
$(CC) $(CFLAGS) -c \
-o $@ ../win/share/tiletext.c
@@ -71,58 +71,58 @@ $(TARGETDIR)/tomb.iff : ../util/xpm2iff ../outdated/sys/amiga/gave16.xpm
$(LINK) $(LFLAGS) -L../lib -o $@ ../util/txt2iff.o -lriffl
../util/xpm2iff.o : ../outdated/sys/amiga/xpm2iff.c $(HACK_H)
$(CC) $(CFLAGS) -o $@ ../outdated/sys/amiga/xpm2iff.c
$(TARGETDIR)/objects.iff: ../win/share/objects.txt ../util/txt2iff
$(TARGETPFX)objects.iff: ../win/share/objects.txt ../util/txt2iff
../util/txt2iff ../win/share/objects.txt $@
$(TARGETDIR)/monsters.iff: ../win/share/monsters.txt ../util/txt2iff
$(TARGETPFX)monsters.iff: ../win/share/monsters.txt ../util/txt2iff
../util/txt2iff ../win/share/monsters.txt $@
$(TARGETDIR)/other.iff: ../win/share/other.txt ../util/txt2iff
$(TARGETPFX)other.iff: ../win/share/other.txt ../util/txt2iff
../util/txt2iff ../win/share/other.txt $@
#
#.PHONY: amigapkg
amigapkg: $(GAMEBIN) $(TARGETDIR)/recover.exe ../dat/nhtiles.bmp
mkdir -p $(TARGETDIR)/pkg
cp $(GAMEBIN) $(TARGETDIR)/pkg/nethack
cp ../dat/nhdat $(TARGETDIR)/pkg/nhdat
cp ../dat/license $(TARGETDIR)/pkg/license
cp ../dat/nhtiles.bmp $(TARGETDIR)/pkg/nhtiles.bmp
cp $(TARGETDIR)/tomb.iff $(TARGETDIR)/pkg/tomb.iff
cp $(TARGETDIR)/monsters.iff $(TARGETDIR)/pkg/monsters.iff
cp $(TARGETDIR)/objects.iff $(TARGETDIR)/pkg/objects.iff
cp $(TARGETDIR)/other.iff $(TARGETDIR)/pkg/other.iff
cp ../dat/symbols $(TARGETDIR)/pkg/symbols
cp ../sys/share/NetHack.cnf $(TARGETDIR)/pkg/nethack.cnf
cp ../sys/msdos/sysconf $(TARGETDIR)/pkg/sysconf
cp ../outdated/sys/amiga/amii.hlp $(TARGETDIR)/pkg/amii.hlp
cp ../sys/msdos/sysconf $(TARGETDIR)/pkg/sysconf
cp ../doc/nethack.txt $(TARGETDIR)/pkg/nethack.txt
amigapkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
mkdir -p $(TARGETPFX)pkg
cp $(GAMEBIN) $(TARGETPFX)pkg/nethack
cp ../dat/nhdat $(TARGETPFX)pkg/nhdat
cp ../dat/license $(TARGETPFX)pkg/license
cp ../dat/nhtiles.bmp $(TARGETPFX)pkg/nhtiles.bmp
cp $(TARGETPFX)tomb.iff $(TARGETPFX)pkg/tomb.iff
cp $(TARGETPFX)monsters.iff $(TARGETPFX)pkg/monsters.iff
cp $(TARGETPFX)objects.iff $(TARGETPFX)pkg/objects.iff
cp $(TARGETPFX)other.iff $(TARGETPFX)pkg/other.iff
cp ../dat/symbols $(TARGETPFX)pkg/symbols
cp ../sys/share/NetHack.cnf $(TARGETPFX)pkg/nethack.cnf
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
cp ../outdated/sys/amiga/amii.hlp $(TARGETPFX)pkg/amii.hlp
cp ../sys/msdos/sysconf $(TARGETPFX)pkg/sysconf
cp ../doc/nethack.txt $(TARGETPFX)pkg/nethack.txt
../util/uudecode ../outdated/sys/amiga/amifont8.uu
cp 8 $(TARGETDIR)/pkg/8
cp 8 $(TARGETPFX)pkg/8
../util/uudecode ../outdated/sys/amiga/amifont.uu
cp hack.font $(TARGETDIR)/pkg/hack.font
cp hack.font $(TARGETPFX)pkg/hack.font
../util/uudecode ../outdated/sys/amiga/dflticon.uu
cp default.icon $(TARGETDIR)/pkg/default.icon
cp default.icon $(TARGETPFX)pkg/default.icon
../util/uudecode ../outdated/sys/amiga/NHinfo.uu
cp NetHack.info $(TARGETDIR)/pkg/NetHack.info
cp NetHack.info $(TARGETPFX)pkg/NetHack.info
../util/uudecode ../outdated/sys/amiga/NewGame.uu
cp NewGame.info $(TARGETDIR)/pkg/NewGame.info
cp NewGame.info $(TARGETPFX)pkg/NewGame.info
../util/uudecode ../outdated/sys/amiga/HackWB.uu
cp HackWB.info $(TARGETDIR)/pkg/HackWB.info
-touch $(TARGETDIR)/pkg/record
zip -9 $(TARGETDIR)/NH370AMI.ZIP $(TARGETDIR)/pkg/*
@echo amiga package zip file $(TARGETDIR)/NH370AMI.ZIP
cp HackWB.info $(TARGETPFX)pkg/HackWB.info
-touch $(TARGETPFX)pkg/record
zip -9 $(TARGETPFX)NH370AMI.ZIP $(TARGETPFX)pkg/*
@echo amiga package zip file $(TARGETPFX)NH370AMI.ZIP
endif # CROSS_TO_AMIGA
#
# shared file dependencies
#
$(TARGETDIR)/pcmain.o : ../sys/share/pcmain.c $(HACK_H)
$(TARGETDIR)/pcsys.o : ../sys/share/pcsys.c $(HACK_H)
$(TARGETDIR)/pctty.o : ../sys/share/pctty.c $(HACK_H)
$(TARGETDIR)/pcunix.o : ../sys/share/pcunix.c $(HACK_H)
$(TARGETDIR)/tileset.o : ../win/share/tileset.c
$(TARGETDIR)/bmptiles.o : ../win/share/bmptiles.c
$(TARGETDIR)/giftiles.o : ../win/share/giftiles.c
$(TARGETDIR)/recover.exe : $(TARGETDIR)/recover.o
$(TARGETPFX)pcmain.o : ../sys/share/pcmain.c $(HACK_H)
$(TARGETPFX)pcsys.o : ../sys/share/pcsys.c $(HACK_H)
$(TARGETPFX)pctty.o : ../sys/share/pctty.c $(HACK_H)
$(TARGETPFX)pcunix.o : ../sys/share/pcunix.c $(HACK_H)
$(TARGETPFX)tileset.o : ../win/share/tileset.c
$(TARGETPFX)bmptiles.o : ../win/share/bmptiles.c
$(TARGETPFX)giftiles.o : ../win/share/giftiles.c
$(TARGETPFX)recover.exe : $(TARGETPFX)recover.o
#
# Lua lib
@@ -133,95 +133,95 @@ $(LUACROSSLIB): $(LUALIBOBJS)
$(TARGET_AR) rcS $@ $(LUAOBJFILES3)
$(TARGET_AR) rcs $@ $(LUAOBJFILES4)
ifdef WANT_WIN_CURSES
$(TARGETDIR)/pdclib.a : $(PDCLIBOBJS) $(PDCOBJS)
$(TARGETPFX)pdclib.a : $(PDCLIBOBJS) $(PDCOBJS)
if [ -f $@ ]; then rm $@; fi;
$(TARGET_AR) rcs $@ $(PDCLIBOBJS) $(PDCOBJS)
endif
#
# Lua src
$(TARGETDIR)/lapi.o : $(LUATOP)/src/lapi.c
$(TARGETDIR)/lauxlib.o : $(LUATOP)/src/lauxlib.c
$(TARGETDIR)/lbaselib.o : $(LUATOP)/src/lbaselib.c
$(TARGETDIR)/lbitlib.o : $(LUATOP)/src/lbitlib.c
$(TARGETDIR)/lcode.o : $(LUATOP)/src/lcode.c
$(TARGETDIR)/lcorolib.o : $(LUATOP)/src/lcorolib.c
$(TARGETDIR)/lctype.o : $(LUATOP)/src/lctype.c
$(TARGETDIR)/ldblib.o : $(LUATOP)/src/ldblib.c
$(TARGETDIR)/ldebug.o : $(LUATOP)/src/ldebug.c
$(TARGETDIR)/ldo.o : $(LUATOP)/src/ldo.c
$(TARGETDIR)/ldump.o : $(LUATOP)/src/ldump.c
$(TARGETDIR)/lfunc.o : $(LUATOP)/src/lfunc.c
$(TARGETDIR)/lgc.o : $(LUATOP)/src/lgc.c
$(TARGETDIR)/linit.o : $(LUATOP)/src/linit.c
$(TARGETDIR)/liolib.o : $(LUATOP)/src/liolib.c
$(TARGETDIR)/llex.o : $(LUATOP)/src/llex.c
$(TARGETDIR)/lmathlib.o : $(LUATOP)/src/lmathlib.c
$(TARGETDIR)/lmem.o : $(LUATOP)/src/lmem.c
$(TARGETDIR)/loadlib.o : $(LUATOP)/src/loadlib.c
$(TARGETDIR)/lobject.o : $(LUATOP)/src/lobject.c
$(TARGETDIR)/lopcodes.o : $(LUATOP)/src/lopcodes.c
$(TARGETDIR)/loslib.o : $(LUATOP)/src/loslib.c
$(TARGETDIR)/lparser.o : $(LUATOP)/src/lparser.c
$(TARGETDIR)/lstate.o : $(LUATOP)/src/lstate.c
$(TARGETDIR)/lstring.o : $(LUATOP)/src/lstring.c
$(TARGETDIR)/lstrlib.o : $(LUATOP)/src/lstrlib.c
$(TARGETDIR)/ltable.o : $(LUATOP)/src/ltable.c
$(TARGETDIR)/ltablib.o : $(LUATOP)/src/ltablib.c
$(TARGETDIR)/ltm.o : $(LUATOP)/src/ltm.c
$(TARGETDIR)/lundump.o : $(LUATOP)/src/lundump.c
$(TARGETDIR)/lutf8lib.o : $(LUATOP)/src/lutf8lib.c
$(TARGETDIR)/lvm.o : $(LUATOP)/src/lvm.c
$(TARGETDIR)/lzio.o : $(LUATOP)/src/lzio.c
$(TARGETPFX)lapi.o : $(LUATOP)/src/lapi.c
$(TARGETPFX)lauxlib.o : $(LUATOP)/src/lauxlib.c
$(TARGETPFX)lbaselib.o : $(LUATOP)/src/lbaselib.c
$(TARGETPFX)lbitlib.o : $(LUATOP)/src/lbitlib.c
$(TARGETPFX)lcode.o : $(LUATOP)/src/lcode.c
$(TARGETPFX)lcorolib.o : $(LUATOP)/src/lcorolib.c
$(TARGETPFX)lctype.o : $(LUATOP)/src/lctype.c
$(TARGETPFX)ldblib.o : $(LUATOP)/src/ldblib.c
$(TARGETPFX)ldebug.o : $(LUATOP)/src/ldebug.c
$(TARGETPFX)ldo.o : $(LUATOP)/src/ldo.c
$(TARGETPFX)ldump.o : $(LUATOP)/src/ldump.c
$(TARGETPFX)lfunc.o : $(LUATOP)/src/lfunc.c
$(TARGETPFX)lgc.o : $(LUATOP)/src/lgc.c
$(TARGETPFX)linit.o : $(LUATOP)/src/linit.c
$(TARGETPFX)liolib.o : $(LUATOP)/src/liolib.c
$(TARGETPFX)llex.o : $(LUATOP)/src/llex.c
$(TARGETPFX)lmathlib.o : $(LUATOP)/src/lmathlib.c
$(TARGETPFX)lmem.o : $(LUATOP)/src/lmem.c
$(TARGETPFX)loadlib.o : $(LUATOP)/src/loadlib.c
$(TARGETPFX)lobject.o : $(LUATOP)/src/lobject.c
$(TARGETPFX)lopcodes.o : $(LUATOP)/src/lopcodes.c
$(TARGETPFX)loslib.o : $(LUATOP)/src/loslib.c
$(TARGETPFX)lparser.o : $(LUATOP)/src/lparser.c
$(TARGETPFX)lstate.o : $(LUATOP)/src/lstate.c
$(TARGETPFX)lstring.o : $(LUATOP)/src/lstring.c
$(TARGETPFX)lstrlib.o : $(LUATOP)/src/lstrlib.c
$(TARGETPFX)ltable.o : $(LUATOP)/src/ltable.c
$(TARGETPFX)ltablib.o : $(LUATOP)/src/ltablib.c
$(TARGETPFX)ltm.o : $(LUATOP)/src/ltm.c
$(TARGETPFX)lundump.o : $(LUATOP)/src/lundump.c
$(TARGETPFX)lutf8lib.o : $(LUATOP)/src/lutf8lib.c
$(TARGETPFX)lvm.o : $(LUATOP)/src/lvm.c
$(TARGETPFX)lzio.o : $(LUATOP)/src/lzio.c
#
# PDCurses src
#
$(TARGETDIR)/addch.o : $(PDCTOP)/pdcurses/addch.c
$(TARGETDIR)/addchstr.o : $(PDCTOP)/pdcurses/addchstr.c
$(TARGETDIR)/addstr.o : $(PDCTOP)/pdcurses/addstr.c
$(TARGETDIR)/attr.o : $(PDCTOP)/pdcurses/attr.c
$(TARGETDIR)/beep.o : $(PDCTOP)/pdcurses/beep.c
$(TARGETDIR)/bkgd.o : $(PDCTOP)/pdcurses/bkgd.c
$(TARGETDIR)/border.o : $(PDCTOP)/pdcurses/border.c
$(TARGETDIR)/clear.o : $(PDCTOP)/pdcurses/clear.c
$(TARGETDIR)/color.o : $(PDCTOP)/pdcurses/color.c
$(TARGETDIR)/delch.o : $(PDCTOP)/pdcurses/delch.c
$(TARGETDIR)/deleteln.o : $(PDCTOP)/pdcurses/deleteln.c
$(TARGETDIR)/getch.o : $(PDCTOP)/pdcurses/getch.c
$(TARGETDIR)/getstr.o : $(PDCTOP)/pdcurses/getstr.c
$(TARGETDIR)/getyx.o : $(PDCTOP)/pdcurses/getyx.c
$(TARGETDIR)/inch.o : $(PDCTOP)/pdcurses/inch.c
$(TARGETDIR)/inchstr.o : $(PDCTOP)/pdcurses/inchstr.c
$(TARGETDIR)/initscr.o : $(PDCTOP)/pdcurses/initscr.c
$(TARGETDIR)/inopts.o : $(PDCTOP)/pdcurses/inopts.c
$(TARGETDIR)/insch.o : $(PDCTOP)/pdcurses/insch.c
$(TARGETDIR)/insstr.o : $(PDCTOP)/pdcurses/insstr.c
$(TARGETDIR)/instr.o : $(PDCTOP)/pdcurses/instr.c
$(TARGETDIR)/kernel.o : $(PDCTOP)/pdcurses/kernel.c
$(TARGETDIR)/keyname.o : $(PDCTOP)/pdcurses/keyname.c
$(TARGETDIR)/mouse.o : $(PDCTOP)/pdcurses/mouse.c
$(TARGETDIR)/move.o : $(PDCTOP)/pdcurses/move.c
$(TARGETDIR)/outopts.o : $(PDCTOP)/pdcurses/outopts.c
$(TARGETDIR)/overlay.o : $(PDCTOP)/pdcurses/overlay.c
$(TARGETDIR)/pad.o : $(PDCTOP)/pdcurses/pad.c
$(TARGETDIR)/panel.o : $(PDCTOP)/pdcurses/panel.c
$(TARGETDIR)/printw.o : $(PDCTOP)/pdcurses/printw.c
$(TARGETDIR)/refresh.o : $(PDCTOP)/pdcurses/refresh.c
$(TARGETDIR)/scanw.o : $(PDCTOP)/pdcurses/scanw.c
$(TARGETDIR)/scr_dump.o : $(PDCTOP)/pdcurses/scr_dump.c
$(TARGETDIR)/scroll.o : $(PDCTOP)/pdcurses/scroll.c
$(TARGETDIR)/slk.o : $(PDCTOP)/pdcurses/slk.c
$(TARGETDIR)/termattr.o : $(PDCTOP)/pdcurses/termattr.c
$(TARGETDIR)/touch.o : $(PDCTOP)/pdcurses/touch.c
$(TARGETDIR)/util.o : $(PDCTOP)/pdcurses/util.c
$(TARGETDIR)/window.o : $(PDCTOP)/pdcurses/window.c
$(TARGETDIR)/debug.o : $(PDCTOP)/pdcurses/debug.c
$(TARGETDIR)/pdcclip.o : $(PDCTOP)/dos/pdcclip.c
$(TARGETDIR)/pdcdisp.o : $(PDCTOP)/dos/pdcdisp.c
$(TARGETDIR)/pdcgetsc.o : $(PDCTOP)/dos/pdcgetsc.c
$(TARGETDIR)/pdckbd.o : $(PDCTOP)/dos/pdckbd.c
$(TARGETDIR)/pdcscrn.o : $(PDCTOP)/dos/pdcscrn.c
$(TARGETDIR)/pdcsetsc.o : $(PDCTOP)/dos/pdcsetsc.c
$(TARGETDIR)/pdcutil.o : $(PDCTOP)/dos/pdcutil.c
$(TARGETPFX)addch.o : $(PDCTOP)/pdcurses/addch.c
$(TARGETPFX)addchstr.o : $(PDCTOP)/pdcurses/addchstr.c
$(TARGETPFX)addstr.o : $(PDCTOP)/pdcurses/addstr.c
$(TARGETPFX)attr.o : $(PDCTOP)/pdcurses/attr.c
$(TARGETPFX)beep.o : $(PDCTOP)/pdcurses/beep.c
$(TARGETPFX)bkgd.o : $(PDCTOP)/pdcurses/bkgd.c
$(TARGETPFX)border.o : $(PDCTOP)/pdcurses/border.c
$(TARGETPFX)clear.o : $(PDCTOP)/pdcurses/clear.c
$(TARGETPFX)color.o : $(PDCTOP)/pdcurses/color.c
$(TARGETPFX)delch.o : $(PDCTOP)/pdcurses/delch.c
$(TARGETPFX)deleteln.o : $(PDCTOP)/pdcurses/deleteln.c
$(TARGETPFX)getch.o : $(PDCTOP)/pdcurses/getch.c
$(TARGETPFX)getstr.o : $(PDCTOP)/pdcurses/getstr.c
$(TARGETPFX)getyx.o : $(PDCTOP)/pdcurses/getyx.c
$(TARGETPFX)inch.o : $(PDCTOP)/pdcurses/inch.c
$(TARGETPFX)inchstr.o : $(PDCTOP)/pdcurses/inchstr.c
$(TARGETPFX)initscr.o : $(PDCTOP)/pdcurses/initscr.c
$(TARGETPFX)inopts.o : $(PDCTOP)/pdcurses/inopts.c
$(TARGETPFX)insch.o : $(PDCTOP)/pdcurses/insch.c
$(TARGETPFX)insstr.o : $(PDCTOP)/pdcurses/insstr.c
$(TARGETPFX)instr.o : $(PDCTOP)/pdcurses/instr.c
$(TARGETPFX)kernel.o : $(PDCTOP)/pdcurses/kernel.c
$(TARGETPFX)keyname.o : $(PDCTOP)/pdcurses/keyname.c
$(TARGETPFX)mouse.o : $(PDCTOP)/pdcurses/mouse.c
$(TARGETPFX)move.o : $(PDCTOP)/pdcurses/move.c
$(TARGETPFX)outopts.o : $(PDCTOP)/pdcurses/outopts.c
$(TARGETPFX)overlay.o : $(PDCTOP)/pdcurses/overlay.c
$(TARGETPFX)pad.o : $(PDCTOP)/pdcurses/pad.c
$(TARGETPFX)panel.o : $(PDCTOP)/pdcurses/panel.c
$(TARGETPFX)printw.o : $(PDCTOP)/pdcurses/printw.c
$(TARGETPFX)refresh.o : $(PDCTOP)/pdcurses/refresh.c
$(TARGETPFX)scanw.o : $(PDCTOP)/pdcurses/scanw.c
$(TARGETPFX)scr_dump.o : $(PDCTOP)/pdcurses/scr_dump.c
$(TARGETPFX)scroll.o : $(PDCTOP)/pdcurses/scroll.c
$(TARGETPFX)slk.o : $(PDCTOP)/pdcurses/slk.c
$(TARGETPFX)termattr.o : $(PDCTOP)/pdcurses/termattr.c
$(TARGETPFX)touch.o : $(PDCTOP)/pdcurses/touch.c
$(TARGETPFX)util.o : $(PDCTOP)/pdcurses/util.c
$(TARGETPFX)window.o : $(PDCTOP)/pdcurses/window.c
$(TARGETPFX)debug.o : $(PDCTOP)/pdcurses/debug.c
$(TARGETPFX)pdcclip.o : $(PDCTOP)/dos/pdcclip.c
$(TARGETPFX)pdcdisp.o : $(PDCTOP)/dos/pdcdisp.c
$(TARGETPFX)pdcgetsc.o : $(PDCTOP)/dos/pdcgetsc.c
$(TARGETPFX)pdckbd.o : $(PDCTOP)/dos/pdckbd.c
$(TARGETPFX)pdcscrn.o : $(PDCTOP)/dos/pdcscrn.c
$(TARGETPFX)pdcsetsc.o : $(PDCTOP)/dos/pdcsetsc.c
$(TARGETPFX)pdcutil.o : $(PDCTOP)/dos/pdcutil.c
#

View File

@@ -8,7 +8,8 @@ ifdef CROSS_TO_MSDOS
BUILD_LUA=1
BUILD_PDCURSES=1
override TARGET = msdos
override TARGETDIR = ../targets/$(TARGET)
override TARGETDIR=../targets/$(TARGET)
override TARGETPFX = $(TARGETDIR)/
override TARGET_LIBS=
endif
@@ -16,7 +17,8 @@ ifdef CROSS_TO_AMIGA
BUILD_LUA=1
BUILD_PDCURSES=1
override TARGET = amiga
override TARGETDIR = ../targets/$(TARGET)
override TARGETDIR=../targets/$(TARGET)
override TARGETPFX = $(TARGETDIR)/
override TARGET_LIBS=
endif
@@ -28,26 +30,26 @@ ifdef BUILD_LUA
LUA_VERSION ?=5.4.0
LUATOP ?= ../lib/lua-$(LUA_VERSION)
LUASRCDIR ?= $(LUATOP)/src
LUAOBJFILES1 = $(TARGETDIR)/lapi.o $(TARGETDIR)/lauxlib.o \
$(TARGETDIR)/lbaselib.o $(TARGETDIR)/lcode.o \
$(TARGETDIR)/lcorolib.o $(TARGETDIR)/lctype.o \
$(TARGETDIR)/ldblib.o
LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
$(TARGETPFX)lbaselib.o $(TARGETPFX)lcode.o \
$(TARGETPFX)lcorolib.o $(TARGETPFX)lctype.o \
$(TARGETPFX)ldblib.o
ifeq "$(LUA_VERSION)" "5.3.5"
LUAOBJFILES1 += $(TARGETDIR)/lbitlib.o
LUAOBJFILES1 += $(TARGETPFX)lbitlib.o
endif
LUAOBJFILES2 = $(TARGETDIR)/ldebug.o $(TARGETDIR)/ldo.o $(TARGETDIR)/ldump.o \
$(TARGETDIR)/lfunc.o $(TARGETDIR)/lgc.o $(TARGETDIR)/linit.o \
$(TARGETDIR)/liolib.o $(TARGETDIR)/llex.o
LUAOBJFILES3 = $(TARGETDIR)/lmathlib.o $(TARGETDIR)/lmem.o \
$(TARGETDIR)/loadlib.o $(TARGETDIR)/lobject.o \
$(TARGETDIR)/lopcodes.o $(TARGETDIR)/loslib.o \
$(TARGETDIR)/lparser.o $(TARGETDIR)/lstate.o
LUAOBJFILES4 = $(TARGETDIR)/lstring.o $(TARGETDIR)/lstrlib.o \
$(TARGETDIR)/ltable.o $(TARGETDIR)/ltablib.o \
$(TARGETDIR)/ltm.o $(TARGETDIR)/lundump.o \
$(TARGETDIR)/lutf8lib.o $(TARGETDIR)/lvm.o $(TARGETDIR)/lzio.o
LUAOBJFILES2 = $(TARGETPFX)ldebug.o $(TARGETPFX)ldo.o $(TARGETPFX)ldump.o \
$(TARGETPFX)lfunc.o $(TARGETPFX)lgc.o $(TARGETPFX)linit.o \
$(TARGETPFX)liolib.o $(TARGETPFX)llex.o
LUAOBJFILES3 = $(TARGETPFX)lmathlib.o $(TARGETPFX)lmem.o \
$(TARGETPFX)loadlib.o $(TARGETPFX)lobject.o \
$(TARGETPFX)lopcodes.o $(TARGETPFX)loslib.o \
$(TARGETPFX)lparser.o $(TARGETPFX)lstate.o
LUAOBJFILES4 = $(TARGETPFX)lstring.o $(TARGETPFX)lstrlib.o \
$(TARGETPFX)ltable.o $(TARGETPFX)ltablib.o \
$(TARGETPFX)ltm.o $(TARGETPFX)lundump.o \
$(TARGETPFX)lutf8lib.o $(TARGETPFX)lvm.o $(TARGETPFX)lzio.o
LUALIBOBJS = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) $(LUAOBJFILES4)
LUACROSSLIB = $(TARGETDIR)/$(O)lua$(subst .,,$(LUA_VERSION)).a
LUACROSSLIB = $(TARGETPFX)$(O)lua$(subst .,,$(LUA_VERSION)).a
LUAINCL = -I$(LUASRCDIR)
BUILDMORE += $(LUACROSSLIB)
override TARGET_LIBS += $(LUACROSSLIB) -lm
@@ -63,33 +65,33 @@ ifdef WANT_WIN_CURSES
PDCTOP = ../lib/pdcurses
PDCURSESDEF= -I../lib/pdcurses -I../lib/pdcurses/dos \
-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE"
PDCLIBOBJ1= $(TARGETDIR)/addch.o $(TARGETDIR)/addchstr.o \
$(TARGETDIR)/addstr.o $(TARGETDIR)/attr.o \
$(TARGETDIR)/beep.o $(TARGETDIR)/bkgd.o \
$(TARGETDIR)/border.o $(TARGETDIR)/clear.o \
$(TARGETDIR)/color.o $(TARGETDIR)/delch.o \
$(TARGETDIR)/deleteln.o $(TARGETDIR)/getch.o \
$(TARGETDIR)/getstr.o $(TARGETDIR)/getyx.o \
$(TARGETDIR)/inch.o
PDCLIBOBJ2= $(TARGETDIR)/inchstr.o $(TARGETDIR)/initscr.o \
$(TARGETDIR)/inopts.o $(TARGETDIR)/insch.o \
$(TARGETDIR)/insstr.o $(TARGETDIR)/instr.o \
$(TARGETDIR)/kernel.o $(TARGETDIR)/keyname.o \
$(TARGETDIR)/mouse.o $(TARGETDIR)/move.o \
$(TARGETDIR)/outopts.o $(TARGETDIR)/overlay.o
PDCLIBOBJ3= $(TARGETDIR)/pad.o $(TARGETDIR)/panel.o $(TARGETDIR)/printw.o \
$(TARGETDIR)/refresh.o $(TARGETDIR)/scanw.o \
$(TARGETDIR)/scr_dump.o $(TARGETDIR)/scroll.o \
$(TARGETDIR)/slk.o $(TARGETDIR)/termattr.o
PDCLIBOBJ4= $(TARGETDIR)/touch.o $(TARGETDIR)/util.o $(TARGETDIR)/window.o \
$(TARGETDIR)/debug.o
PDCLIBOBJ1= $(TARGETPFX)addch.o $(TARGETPFX)addchstr.o \
$(TARGETPFX)addstr.o $(TARGETPFX)attr.o \
$(TARGETPFX)beep.o $(TARGETPFX)bkgd.o \
$(TARGETPFX)border.o $(TARGETPFX)clear.o \
$(TARGETPFX)color.o $(TARGETPFX)delch.o \
$(TARGETPFX)deleteln.o $(TARGETPFX)getch.o \
$(TARGETPFX)getstr.o $(TARGETPFX)getyx.o \
$(TARGETPFX)inch.o
PDCLIBOBJ2= $(TARGETPFX)inchstr.o $(TARGETPFX)initscr.o \
$(TARGETPFX)inopts.o $(TARGETPFX)insch.o \
$(TARGETPFX)insstr.o $(TARGETPFX)instr.o \
$(TARGETPFX)kernel.o $(TARGETPFX)keyname.o \
$(TARGETPFX)mouse.o $(TARGETPFX)move.o \
$(TARGETPFX)outopts.o $(TARGETPFX)overlay.o
PDCLIBOBJ3= $(TARGETPFX)pad.o $(TARGETPFX)panel.o $(TARGETPFX)printw.o \
$(TARGETPFX)refresh.o $(TARGETPFX)scanw.o \
$(TARGETPFX)scr_dump.o $(TARGETPFX)scroll.o \
$(TARGETPFX)slk.o $(TARGETPFX)termattr.o
PDCLIBOBJ4= $(TARGETPFX)touch.o $(TARGETPFX)util.o $(TARGETPFX)window.o \
$(TARGETPFX)debug.o
PDCLIBOBJS = $(PDCLIBOBJ1) $(PDCLIBOBJ2) $(PDCLIBOBJ3) $(PDCLIBOBJ4)
PDCLIB = $(TARGETDIR)/pdclib.a
PDCLIB = $(TARGETPFX)pdclib.a
PDCINCL = -I$(PDCTOP) -I$(PDCTOP)/pdcurses
PDCOBJS = $(TARGETDIR)/pdcclip.o $(TARGETDIR)/pdcdisp.o \
$(TARGETDIR)/pdcgetsc.o $(TARGETDIR)/pdckbd.o \
$(TARGETDIR)/pdcscrn.o $(TARGETDIR)/pdcsetsc.o \
$(TARGETDIR)/pdcutil.o
PDCOBJS = $(TARGETPFX)pdcclip.o $(TARGETPFX)pdcdisp.o \
$(TARGETPFX)pdcgetsc.o $(TARGETPFX)pdckbd.o \
$(TARGETPFX)pdcscrn.o $(TARGETPFX)pdcsetsc.o \
$(TARGETPFX)pdcutil.o
override TARGET_LIBS += $(PDCLIB)
ifdef CROSS_TO_MSDOS
PDCINCL += -I$(PDCTOP)/dos
@@ -100,7 +102,7 @@ override TARGET_LIBS += -lSDL
endif
BUILDMORE += $(PDCLIB)
# Rules for PDCurses files
$(TARGETDIR)/%.o : $(PDCTOP)/pdcurses/%.c
$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
else #WANT_WIN_CURSES
PDCURSESDEF=
@@ -151,30 +153,30 @@ override SYSSRC = ../sys/share/pcmain.c ../sys/msdos/msdos.c \
../sys/msdos/vidvga.c ../sys/msdos/vidvesa.c \
../win/share/bmptiles.c ../win/share/giftiles.c \
../win/share/tileset.c
override SYSOBJ= $(TARGETDIR)/pcmain.o $(TARGETDIR)/msdos.o \
$(TARGETDIR)/pcsys.o $(TARGETDIR)/pctty.o \
$(TARGETDIR)/pcunix.o $(TARGETDIR)/video.o \
$(TARGETDIR)/vidtxt.o $(TARGETDIR)/pckeys.o \
$(TARGETDIR)/vidvga.o $(TARGETDIR)/vidvesa.o \
$(TARGETDIR)/bmptiles.o $(TARGETDIR)/giftiles.o \
$(TARGETDIR)/tileset.o $(TARGETDIR)/tile.o
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)bmptiles.o $(TARGETPFX)giftiles.o \
$(TARGETPFX)tileset.o $(TARGETPFX)tile.o
override WINLIB=
override LUALIB=
override GAMEBIN = $(TARGETDIR)/nethack.exe
override GAMEBIN = $(TARGETPFX)nethack.exe
override PACKAGE= dospkg
VARDATND += nhtiles.bmp
PREGAME = mkdir -p $(TARGETDIR)
CLEANMORE += rm -r $(TARGETDIR)
BUILDMORE += $(TARGETDIR)/recover.exe
BUILDMORE += $(TARGETPFX)recover.exe
#
ifdef WANT_WIN_CURSES
# rules for pdcurses dos-specific files
$(TARGETDIR)/%.o : $(PDCTOP)/dos/%.c
$(TARGETPFX)%.o : $(PDCTOP)/dos/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
endif # WANT_WIN_CURSES
#
# Rule for files in sys/msdos
$(TARGETDIR)/%.o : ../sys/msdos/%.c
$(TARGETPFX)%.o : ../sys/msdos/%.c
$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
endif # CROSS_TO_MSDOS
#=================================================================
@@ -203,7 +205,7 @@ TOOLTOP = /opt/amiga/bin
#TOOLARCH = -m68020 -mcrt=clib2
#TOOLARCH = -m68020 #newlib
TOOLARCH = -m68020 -noixemul
override REGEXOBJ = $(TARGETDIR)/cppregex.o
override REGEXOBJ = $(TARGETPFX)cppregex.o
override TARGET_CC = $(TOOLTOP)/m68k-amigaos-gcc
override TARGET_CXX = $(TOOLTOP)/m68k-amigaos-c++
override TARGET_AR = $(TOOLTOP)/m68k-amigaos-ar
@@ -216,7 +218,7 @@ override TARGET_CFLAGS = -c -O $(TOOLARCH) \
-DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET \
-DAMIGA_VERSION_STRING=\""VER: NetHack 3.7.0 \(12.13.2020)\""
override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
ifeq "$(REGEXOBJ)" "$(TARGETDIR)/cppregex.o"
ifeq "$(REGEXOBJ)" "$(TARGETPFX)cppregex.o"
override TARGET_LINK = $(TARGET_CXX)
else
override TARGET_LINK = $(TARGET_CC)
@@ -237,48 +239,48 @@ override SYSSRC = ../outdated/sys/amiga/amidos.c ../outdated/sys/amiga/amigst.c
../win/share/tileset.c
# ../outdated/sys/amiga/xpm2iff.c
# ../outdated/sys/amiga/txt2iff.c
override SYSOBJ = $(TARGETDIR)/amidos.o $(TARGETDIR)/amigst.o \
$(TARGETDIR)/amirip.o $(TARGETDIR)/amistack.o \
$(TARGETDIR)/amitty.o $(TARGETDIR)/amiwind.o \
$(TARGETDIR)/winami.o $(TARGETDIR)/winchar.o \
$(TARGETDIR)/winfuncs.o $(TARGETDIR)/winkey.o \
$(TARGETDIR)/winamenu.o $(TARGETDIR)/winreq.o \
$(TARGETDIR)/winstr.o $(TARGETDIR)/pcmain.o \
$(TARGETDIR)/bmptiles.o $(TARGETDIR)/giftiles.o \
$(TARGETDIR)/tileset.o
# $(TARGETDIR)/xpm2iff.o
override SYSOBJ = $(TARGETPFX)amidos.o $(TARGETPFX)amigst.o \
$(TARGETPFX)amirip.o $(TARGETPFX)amistack.o \
$(TARGETPFX)amitty.o $(TARGETPFX)amiwind.o \
$(TARGETPFX)winami.o $(TARGETPFX)winchar.o \
$(TARGETPFX)winfuncs.o $(TARGETPFX)winkey.o \
$(TARGETPFX)winamenu.o $(TARGETPFX)winreq.o \
$(TARGETPFX)winstr.o $(TARGETPFX)pcmain.o \
$(TARGETPFX)bmptiles.o $(TARGETPFX)giftiles.o \
$(TARGETPFX)tileset.o
# $(TARGETPFX)xpm2iff.o
# ../util/txt2iff.o
override WINLIB=
override LUALIB=
override GAMEBIN = $(TARGETDIR)/nethack.exe
override GAMEBIN = $(TARGETPFX)nethack.exe
override PACKAGE= amigapkg
PREGAME = mkdir -p ../targets/amiga
CLEANMORE += rm -r ../targets/amiga
BUILDMORE += $(TARGETDIR)/recover.exe
BUILDMORE += $(TARGETPFX)recover.exe
# ../util/txt2iff
#
ifdef WANT_WIN_CURSES
# rules for pdcurses sdl1-specific files
$(TARGETDIR)/%.o : $(PDCTOP)/sdl1/%.c
$(TARGETPFX)%.o : $(PDCTOP)/sdl1/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
endif # WANT_WIN_CURSES
# Rule for files in sys/amiga
$(TARGETDIR)/%.o : ../outdated/sys/amiga/%.c
$(TARGETPFX)%.o : ../outdated/sys/amiga/%.c
$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
endif # CROSS_TO_AMIGA
#=================================================================
ifdef WANT_WIN_CURSES
# rules for pdcurses dos-specific files
$(TARGETDIR)/%.o : $(PDCTOP)/sdl1/%.c
$(TARGETPFX)%.o : $(PDCTOP)/sdl1/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
endif # WANT_WIN_CURSES
# Rule for LUA files
$(TARGETDIR)/%.o : $(LUATOP)/src/%.c
$(TARGETPFX)%.o : $(LUATOP)/src/%.c
$(TARGET_CC) $(TARGET_CFLAGS) $(LUA_FLAGS) -o$@ $<
ifdef WANT_WIN_CURSES
# Rules for PDCurses files
$(TARGETDIR)/%.o : $(PDCTOP)/pdcurses/%.c
$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@ $<
endif # WANT_WIN_CURSES