From: nhmall <nhmall@nethack.org>
Date: Tue, 26 Nov 2019 05:02:38 +0000 (-0500)
Subject: more msdos cross-compile fixes
X-Git-Tag: NetHack-3.7.0_WIP~228^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36983e6889da4282bc64db419fc68a02ad1079aa;p=nethack

more msdos cross-compile fixes
undefined reference to g.variables if certain parts of
drawing.c are included in host-side utilities, so
surround the offending code in
->  #if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
---

diff --git a/src/drawing.c b/src/drawing.c
index 1bf81102e..8a97c4496 100644
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -291,6 +291,7 @@ char ch;
     return i;
 }
 
+#if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
 /*
  * Explanations of the functions found below:
  *
@@ -810,5 +811,6 @@ const struct symparse loadsyms[] = {
     { SYM_OTH, SYM_HERO_OVERRIDE + SYM_OFF_X, "S_hero_override" },
     { 0, 0, (const char *) 0 } /* fence post */
 };
+#endif /* !CROSSCOMPILE || CROSSCOMPILE_TARGET */
 
 /*drawing.c*/
diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross
index d00d19852..8c9324076 100644
--- a/sys/msdos/Makefile1.cross
+++ b/sys/msdos/Makefile1.cross
@@ -145,11 +145,9 @@ TEXTIO      = $(HOST_O)tiletext.o $(HOST_O)tiletxt.o $(HOST_O)drawing.o $(HOST_O
 TEXTIO2     = $(HOST_O)tiletex2.o $(HOST_O)tiletxt2.o $(HOST_O)drawing.o $(HOST_O)decl.o $(HOST_O)monst.o \
 		$(HOST_O)objects.o
 
-#PLANAR_TIB  = $(DAT)/NETHACK1.TIB
-#OVERVIEW_TIB = $(DAT)/NETHACKO.TIB
 TILE_BMP    = $(DAT)/NHTILES.BMP
 
-TILEUTIL    = $(TILOBJ) $(U)tile2bin $(U)til2bin2 $(TILE_BMP) $(PLANAR_TIB) $(OVERVIEW_TIB)
+TILEUTIL    = $(TILOBJ) $(TILE_BMP)
 
 TILEFILES   = $(WSHR)/monsters.txt $(WSHR)/objects.txt $(WSHR)/other.txt
 
@@ -255,7 +253,7 @@ LFLAGS =
 #==========================================
 
 $(HOST_O)%.o : $(SRC)/%.c
-	$(HOST_CC) $(cflags) -o$@ $<
+	$(HOST_CC) $(cflags)  -o$@ $<
 
 #==========================================
 # Rules for host files in sys/msdos
@@ -303,8 +301,7 @@ $(HOST_O)utility.tag: $(INCL)/date.h $(INCL)/trap.h $(INCL)/onames.h \
 tileutil: $(U)gif2txt $(U)txt2ppm
 	@echo Optional tile development utilities are up to date.
 
-$(HOST_O)prereq.tag: hobj.tag $(U)makedefs $(HOST_O)utility.tag  \
-		$(HOST_O)thintile.tag $(DAT)/nhdat
+$(HOST_O)prereq.tag: hobj.tag $(U)makedefs $(HOST_O)utility.tag $(DAT)/nhdat
 	echo prereq done >$@
 
 #==========================================
@@ -418,17 +415,17 @@ $(HOST_O)tilemap.o: $(WSHR)/tilemap.c $(HACK_H) $(TILE_H)
 #  Required for tile support
 #==========================================
 
-$(DAT)/NetHack1.tib: $(TILEFILES) $(U)tile2bin
-	@echo Creating binary tile files
-	cd $(DAT)
-	$(U)tile2bin
-	cd $(SRC)
+#$(DAT)/NetHack1.tib: $(TILEFILES) $(U)tile2bin
+#	@echo Creating binary tile files
+#	cd $(DAT)
+#	$(U)tile2bin
+#	cd $(SRC)
 
-$(DAT)/NetHacko.tib: $(HOST_O)thintile.tag $(TILEFILES2) $(U)til2bin2
-	@echo Creating overview binary tile files
-	cd $(DAT)
-	$(U)til2bin2
-	cd $(SRC)
+#$(DAT)/NetHacko.tib: $(HOST_O)thintile.tag $(TILEFILES2) $(U)til2bin2
+#	@echo Creating overview binary tile files
+#	cd $(DAT)
+#	$(U)til2bin2
+#	cd $(SRC)
 
 $(DAT)/NHTILES.BMP: $(TILEFILES) $(U)tile2bmp
 	@echo Creating binary tile files which may take some time
@@ -441,39 +438,39 @@ $(U)tile2bmp: $(HOST_O)tile2bmp.o $(TEXTIO)
 	ar r temp.a $(TEXTIO)
 	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)tile2bmp.o temp.a
 
-$(U)tile2bin: $(HOST_O)tile2bin.o $(TEXTIO)
-	-rm -f temp.a
-	ar r temp.a $(TEXTIO)
-	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)tile2bin.o temp.a
+#$(U)tile2bin: $(HOST_O)tile2bin.o $(TEXTIO)
+#	-rm -f temp.a
+#	ar r temp.a $(TEXTIO)
+#	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)tile2bin.o temp.a
 
-$(U)til2bin2: $(HOST_O)til2bin2.o $(TEXTIO2)
-	-rm -f temp.a
-	ar r temp.a $(TEXTIO2)
-	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)til2bin2.o temp.a
+#$(U)til2bin2: $(HOST_O)til2bin2.o $(TEXTIO2)
+#	-rm -f temp.a
+#	ar r temp.a $(TEXTIO2)
+#	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)til2bin2.o temp.a
 
-$(U)thintile: $(HOST_O)thintile.o
-	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)thintile.o
+#$(U)thintile: $(HOST_O)thintile.o
+#	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)thintile.o
 
 #$(HOST_O)thintile.o:  $(HACK_H) $(WSHR)/tile.h $(WSHR)/thintile.c
 #	-rm -f temp.a
 #	ar r temp.a $(TEXTIO)
 #	$(HOST_LINK) $(LFLAGS) -o$@ $(HOST_O)tile2bmp.o temp.a
 
-$(HOST_O)thintile.o:  $(HACK_H) $(WSHR)/tile.h $(WSHR)/thintile.c
-	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE -DOVERVIEW_FILE -o$@ $(WSHR)/thintile.c
+#$(HOST_O)thintile.o:  $(HACK_H) $(WSHR)/tile.h $(WSHR)/thintile.c
+#	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE -DOVERVIEW_FILE -o$@ $(WSHR)/thintile.c
 
-$(HOST_O)thintile.tag: $(U)thintile $(TILEFILES)
-	$(U)thintile
-	echo thintiles created >$@
+#$(HOST_O)thintile.tag: $(U)thintile $(TILEFILES)
+#	$(U)thintile
+#	echo thintiles created >$@
 
 $(HOST_O)tile2bmp.o:  $(HACK_H) $(TILE_H) $(WSHR)/tile2bmp.c
 	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(WSHR)/tile2bmp.c
 
-$(HOST_O)tile2bin.o:  $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c
-	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/tile2bin.c
+#$(HOST_O)tile2bin.o:  $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c
+#	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(MSYS)/tile2bin.c
 
-$(HOST_O)til2bin2.o:  $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c
-	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE_X=8 -DOVERVIEW_FILE -o$@ $(MSYS)/tile2bin.c
+#$(HOST_O)til2bin2.o:  $(HACK_H) $(TILE_H) $(MSYS)/pctiles.h $(MSYS)/pcvideo.h $(MSYS)/tile2bin.c
+#	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -DTILE_X=8 -DOVERVIEW_FILE -o$@ $(MSYS)/tile2bin.c
 
 $(HOST_O)tiletext.o:  $(CONFIG_H) $(TILE_H) $(WSHR)/tiletext.c
 	$(HOST_CC) $(cflags) -I$(MSYS) -I$(WSHR) -o$@ $(WSHR)/tiletext.c
diff --git a/sys/msdos/msdos-cross-compile.sh b/sys/msdos/msdos-cross-compile.sh
index 7516d1937..4df9fc3cf 100644
--- a/sys/msdos/msdos-cross-compile.sh
+++ b/sys/msdos/msdos-cross-compile.sh
@@ -31,7 +31,7 @@ DJGPP_URL="$DJGPP_URL$DJGPP_FILE"
 
 # export
 
-if [ ! -d lib]; then
+if [ ! -d lib ]; then
 mkdir -p lib
 fi