From: nhmall <nhmall@nethack.org>
Date: Thu, 4 Feb 2021 23:53:18 +0000 (-0500)
Subject: more msdos cross-compile pdcurses warning suppression
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c87b556f42255ea7d9e22c6ade93cacbc2b88330;p=nethack

more msdos cross-compile pdcurses warning suppression
---

diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index dc23ba998..31c81d515 100644
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -114,9 +114,11 @@ 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,9 +159,8 @@ MSDOS_TARGET_CFLAGS = -c -O -I../include -I../sys/msdos -I../win/share \
 	-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-declarations -Wmissing-parameter-type
-override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-prototypes
+        -Wimplicit-function-declaration -Wimplicit-int -Wmissing-parameter-type
+override TARGET_CFLAGS = $(MSDOS_TARGET_CFLAGS) -Wmissing-declarations -Wmissing-prototypes
 override TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 override TARGET_LINK = $(TOOLTOP1)/i586-pc-msdosdjgpp-gcc
 override TARGET_LFLAGS=
@@ -188,9 +189,14 @@ 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 -o$@  $<
+	$(TARGET_CC) $(PDCINCL) $(MSDOS_TARGET_CFLAGS) -Wno-unused-parameter \
+		-Wno-missing-prototypes -o$@  $<
 endif  # WANT_WIN_CURSES
 #
 # Rule for files in sys/msdos