From: nhmall <nhmall@nethack.org>
Date: Thu, 1 Oct 2020 14:04:05 +0000 (-0400)
Subject: more recover and cross-compiling
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1261aedd457f88796e8db0d5ae7dabe01cca2b7e;p=nethack

more recover and cross-compiling
---

diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.2020
index 1b4a984bb..2c34d2189 100644
--- a/sys/unix/hints/include/cross-post.2020
+++ b/sys/unix/hints/include/cross-post.2020
@@ -18,12 +18,16 @@ $(TARGETPFX)vidvesa.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
 $(TARGETPFX)vidstub.o : ../sys/msdos/vidvesa.c ../sys/msdos/portio.h \
 		$(HACK_H)
 $(TARGETPFX)tile.o : tile.c
+$(GAMEBIN) : $(HOBJ)
+	$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
+	$(HOBJ) $(WINLIB) $(TARGET_LIBS) $(LUALIB)
 #
-#.PHONY: dospkg
+.PHONY: dospkg
 dospkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
 	$(TARGET_STUBEDIT) $(GAMEBIN) minstack=2048K
 	mkdir -p $(TARGETPFX)pkg
 	cp $(GAMEBIN) $(TARGETPFX)pkg/NETHACK.EXE
+	cp $(TARGETPFX)recover.exe $(TARGETPFX)pkg/RECOVER.EXE
 	cp ../dat/nhdat $(TARGETPFX)pkg/NHDAT
 	cp ../dat/license $(TARGETPFX)pkg/LICENSE
 	cp ../dat/nhtiles.bmp $(TARGETPFX)pkg/NHTILES.BMP
@@ -77,8 +81,11 @@ $(TARGETPFX)monsters.iff: ../win/share/monsters.txt ../util/txt2iff
 	../util/txt2iff ../win/share/monsters.txt $@
 $(TARGETPFX)other.iff: ../win/share/other.txt ../util/txt2iff
 	../util/txt2iff ../win/share/other.txt $@
+$(GAMEBIN) : $(HOBJ)
+	$(TARGET_LINK) $(TARGET_LFLAGS) -o $(GAMEBIN) \
+	$(HOBJ) $(WINLIB) $(TARGET_LIBS) $(LUALIB)
 #
-#.PHONY: amigapkg
+.PHONY: amigapkg
 amigapkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
 	mkdir -p $(TARGETPFX)pkg
 	cp $(GAMEBIN) $(TARGETPFX)pkg/nethack
@@ -112,9 +119,8 @@ amigapkg: $(GAMEBIN) $(TARGETPFX)recover.exe ../dat/nhtiles.bmp
 	@echo amiga package zip file $(TARGETPFX)NH370AMI.ZIP
 endif  # CROSS_TO_AMIGA
 
-#
+ifdef CROSS_SHARED
 # shared file dependencies
-#
 $(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)
@@ -124,8 +130,10 @@ $(TARGETPFX)bmptiles.o : ../win/share/bmptiles.c
 $(TARGETPFX)giftiles.o : ../win/share/giftiles.c
 $(TARGETPFX)recover.o : ../util/recover.c
 $(TARGETPFX)recover.exe : $(TARGETPFX)recover.o
-	$(TARGET_LINK) $(TARGET_LFLAGS) -o $@ $(TARGETPFX)recover.o $(TARGET_LIBS)
+	$(TARGET_LINK) $(TARGET_LFLAGS) $(TARGETPFX)recover.o -o $@
+endif  # CROSS_SHARED
 #
+ifdef BUILD_LUA
 # Lua lib
 $(LUACROSSLIB): $(LUALIBOBJS)
 	if [ -f $@ ]; then rm $@; fi;
@@ -173,9 +181,10 @@ $(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
-#
+endif  # BUILD_LUA
+
+ifdef BUILD_PDCURSES
 # PDCurses src
-#
 $(TARGETPFX)addch.o : $(PDCTOP)/pdcurses/addch.c
 $(TARGETPFX)addchstr.o : $(PDCTOP)/pdcurses/addchstr.c
 $(TARGETPFX)addstr.o : $(PDCTOP)/pdcurses/addstr.c
@@ -223,8 +232,7 @@ $(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
-
-
+endif  # BUILD_PDCURSES
 #
 # End of cross-compiling -POST section
 #===============-=================================================
diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index e66275ea3..174ad81e2 100644
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -7,6 +7,7 @@
 ifdef CROSS_TO_MSDOS
 BUILD_LUA=1
 BUILD_PDCURSES=1
+CROSS_SHARED=1
 override TARGET = msdos
 override TARGETDIR=../targets/$(TARGET)
 override TARGETPFX = $(TARGETDIR)/
@@ -16,6 +17,7 @@ endif
 ifdef CROSS_TO_AMIGA
 BUILD_LUA=1
 BUILD_PDCURSES=1
+CROSS_SHARED=1
 override TARGET = amiga
 override TARGETDIR=../targets/$(TARGET)
 override TARGETPFX = $(TARGETDIR)/
@@ -166,8 +168,7 @@ override GAMEBIN = $(TARGETPFX)nethack.exe
 override PACKAGE= dospkg
 VARDATND += nhtiles.bmp
 PREGAME = mkdir -p $(TARGETDIR)
-CLEANMORE += rm -r $(TARGETDIR)
-BUILDMORE += $(TARGETPFX)recover.exe
+CLEANMORE += rm -f -r $(TARGETDIR)
 #
 ifdef WANT_WIN_CURSES
 # rules for pdcurses dos-specific files
@@ -252,11 +253,10 @@ override SYSOBJ = $(TARGETPFX)amidos.o $(TARGETPFX)amigst.o \
 #		../util/txt2iff.o
 override WINLIB=
 override LUALIB=
-override GAMEBIN = $(TARGETPFX)nethack.exe
+override GAMEBIN = $(TARGETPFX)nethack
 override PACKAGE= amigapkg
 PREGAME = mkdir -p ../targets/amiga
 CLEANMORE += rm -r ../targets/amiga
-BUILDMORE += $(TARGETPFX)recover.exe
 #		../util/txt2iff
 #
 ifdef WANT_WIN_CURSES
@@ -269,7 +269,7 @@ $(TARGETPFX)%.o : ../outdated/sys/amiga/%.c
 	$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
 endif  # CROSS_TO_AMIGA
 #=================================================================
-
+ifdef CROSS_SHARED
 ifdef WANT_WIN_CURSES
 # rules for pdcurses dos-specific files
 $(TARGETPFX)%.o : $(PDCTOP)/sdl1/%.c
@@ -289,6 +289,8 @@ $(TARGETPFX)%.o : ../win/share/%.c
 # Rules for util files heading for target
 $(TARGETPFX)%.o : ../util/%.c
 	$(TARGET_CC) $(TARGET_CFLAGS) -o$@ $<
+endif  # CROSS_SHARED
+#
 # End of cross-compiling -PRE section
 #===============-=================================================