From: nhmall <nhmall@nethack.org>
Date: Fri, 5 Feb 2021 00:42:07 +0000 (-0500)
Subject: more cross-compile warning bits
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b14c47132f890caa05b7245a2c5cd797ee2434f5;p=nethack

more cross-compile warning bits

maximize warnings for NetHack sources
minimize warnings for Lua and pdcurses which we won't be changing
---

diff --git a/src/mail.c b/src/mail.c
index cbcaa9f3c..a3f63b751 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -452,6 +452,8 @@ ckmailstatus(void)
     }
 }
 
+DISABLE_WARNING_FORMAT_NONLITERAL
+
 /*ARGSUSED*/
 void
 readmail(struct obj *otmp UNUSED)
@@ -522,6 +524,8 @@ readmail(struct obj *otmp UNUSED)
         pline("It reads:  \"%s\"", junk[rn2(SIZE(junk))]);
 }
 
+RESTORE_WARNING_FORMAT_NONLITERAL
+
 #endif /* !UNIX && !VMS */
 
 #ifdef UNIX
diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh
index f69cf9260..55c47bb2c 100644
--- a/sys/msdos/fetch-cross-compiler.sh
+++ b/sys/msdos/fetch-cross-compiler.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#set -x
+set -x
 
 if [ -z "$TRAVIS_BUILD_DIR" ]; then
 	export DJGPP_TOP=$(pwd)/lib/djgpp
diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index 31c81d515..6d02d5701 100644
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -106,19 +106,9 @@ PDCOBJS = $(TARGETPFX)pdcclip.o $(TARGETPFX)pdcdisp.o \
 		$(TARGETPFX)pdcutil.o
 override TARGET_LIBS += $(PDCLIB)
 ifdef CROSS_TO_MSDOS
-PDCINCL += -I$(PDCTOP)/dos
-endif
-ifdef CROSS_TO_AMIGA
-PDCINCL += -I$(PDCTOP)/sdl1 -I/opt/amiga/m68k-amigaos/include/SDL
-override TARGET_LIBS += -lSDL
 endif
 override BUILDMORE += $(PDCLIB)
 override CLEANMORE += rm -f $(PDCLIB) ;
-ifndef CROSS_TO_MSDOS
-# Rules for PDCurses files
-$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
-	$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -o$@  $<
-endif  # CROSS_TO_MSDOS
 else   #WANT_WIN_CURSES
 PDCURSESDEF=
 PDCLIBOBJS=
@@ -157,10 +147,18 @@ override TARGET_STUBEDIT = ../lib/djgpp/i586-pc-msdosdjgpp/bin/stubedit
 MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
 	$(LUAINCL) -DDLB $(PDCURSESDEF) \
 	-DUSE_TILES -DCROSSCOMPILE -DCROSSCOMPILE_TARGET -DCROSS_TO_MSDOS \
-        -Wall -Wextra -Wno-missing-field-initializers -Wimplicit \
-        -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wwrite-strings \
-        -Wimplicit-function-declaration -Wimplicit-int -Wmissing-parameter-type
-override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations -Wmissing-prototypes
+        -Wall -Wextra -Wno-missing-field-initializers -Wreturn-type -Wunused \
+        -Wformat -Wswitch -Wshadow -Wwrite-strings \
+	-Wimplicit -Wimplicit-function-declaration -Wimplicit-int \
+	-Wmissing-parameter-type -Wold-style-definition -Wstrict-prototypes \
+	-DGCC_WARN
+PDCINCL += -I$(PDCTOP)/dos
+PDC_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
+			-Wno-missing-prototypes
+LUA_TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS)
+override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations \
+			-Wmissing-prototypes -pedantic -Wmissing-declarations \
+			-Wformat-nonliteral
 override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
 override TARGET_LFLAGS=
@@ -189,14 +187,9 @@ override CLEANMORE += rm -f -r $(TARGETDIR) ;
 VARDATND += nhtiles.bmp
 #
 ifdef WANT_WIN_CURSES
-# Rules for PDCurses files
-$(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
-	$(TARGET_CC) $(PDCINCL) $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
-		-Wno-missing-prototypes -o$@  $<
 # rules for pdcurses dos-specific files
 $(TARGETPFX)%.o : $(PDCTOP)/dos/%.c
-	$(TARGET_CC) $(PDCINCL) $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
-		-Wno-missing-prototypes -o$@  $<
+	$(TARGET_CC) $(PDCINCL) $(PDC_TARGET_CFLAGS) -o$@  $<
 endif  # WANT_WIN_CURSES
 #
 # Rule for files in sys/msdos
@@ -285,6 +278,7 @@ WASM_TARGET_CFLAGS = -DCROSSCOMPILE_TARGET -DCROSS_TO_WASM
 override CFLAGS = $(WASM_CFLAGS)
 override TARGET_CFLAGS = $(EMCC_CFLAGS) $(WASM_CFLAGS) $(WASM_TARGET_CFLAGS)
 #
+LUA_TARGET_CFLAGS = $(TARGET_CFLAGS)
 override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 override TARGET_LINK = $(TARGET_CC)
 override TARGET_LFLAGS= $(EMCC_LFLAGS)
@@ -327,7 +321,7 @@ ifdef WANT_WIN_CURSES
 ifdef BUILD_PDCURSES
 # Rules for PDCurses files
 $(TARGETPFX)%.o : $(PDCTOP)/pdcurses/%.c
-	$(TARGET_CC) $(PDCINCL) $(TARGET_CFLAGS) -c -o$@  $<
+	$(TARGET_CC) $(PDCINCL) $(PDC_TARGET_CFLAGS) -c -o$@  $<
 endif  # BUILD_PDCURSES
 endif  # WANT_WIN_CURSES
 
@@ -343,7 +337,7 @@ endif  # CROSS_SHARED
 ifdef BUILD_TARGET_LUA
 # Rule for LUA files
 $(TARGETPFX)%.o : $(LUATOP)/src/%.c
-	$(TARGET_CC) $(TARGET_CFLAGS) -c $(LUA_FLAGS) -o$@ $<
+	$(TARGET_CC) $(LUA_TARGET_CFLAGS) -c $(LUA_FLAGS) -o$@ $<
 endif  # BUILD_TARGET_LUA
 #
 # End of cross-compiling -PRE section