From 00ff94caa21f36ab39056b11694bde06ce4c8529 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 18 Aug 2020 16:45:00 -0700
Subject: [PATCH] Makefile: Make WARNINGMODE the default, optionally disable
 with RELAXWARNINGS

(cherry picked from commit 9495e6354fed1028c6fc502cc9d946cfdd0b7896)
---
 src/Makefile     | 3 ++-
 src/Makefile.cfg | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b417a38e..171225dc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,7 +60,8 @@
 #     Compile with GCC 4.6x version, add 'GCC46=1'
 #     Compile a profile version, add 'PROFILEMODE=1'
 #     Compile a debug version, add 'DEBUGMODE=1'
-#     Compile with extra warnings, add 'WARNINGMODE=1'
+#     Compile with less warnings, add 'RELAXWARNINGS=1'
+#     Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
 #     Compile without NASM's tmap.nas, add 'NOASM=1'
 #     Compile without 3D hardware support, add 'NOHW=1'
 #     Compile with GDBstubs, add 'RDB=1'
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index dcbbe027..e45265ca 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -214,10 +214,7 @@ WFLAGS=-Wall
 ifndef GCC295
 #WFLAGS+=-Wno-packed
 endif
-ifdef ERRORMODE
-WARNINGMODE=1
-endif
-ifdef WARNINGMODE
+ifndef RELAXWARNINGS
  WFLAGS+=-W
 #WFLAGS+=-Wno-sign-compare
 ifndef GCC295