From 7ce6cbb57f0980106c99ff214ca3585fddb2c0a3 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Fri, 12 Jan 2007 00:53:28 +0000
Subject: [PATCH] Allow building with the "WIDE=Y" parameter for all Win32
 compilers, except LCC.

---
 win32/bccwin32.mak  | 10 +++++++---
 win32/gccwin32.mak  |  8 ++++++--
 win32/mingwin32.mak |  8 ++++++--
 win32/wccwin32.mak  |  9 +++++++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index 3b846ccb..802e9b40 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -2,7 +2,7 @@
 #
 # Borland MAKE Makefile for PDCurses library - Win32 BC++ 4.0+
 #
-# Usage: make -f [path\]bccwin32.mak [-DDEBUG] [target]
+# Usage: make -f [path\]bccwin32.mak [DEBUG=] [WIDE=] [target]
 #
 # where target can be any of:
 # [all|demos|pdcurses.lib|panel.lib|testcurs.exe...]
@@ -28,12 +28,16 @@ osdir		= $(PDCURSES_HOME)\win32
 CC		= bcc32 -q
 
 !if $d(DEBUG)
-CFLAGS		= -N -v -y -DPDCDEBUG
+CFLAGS		= -N -v -y -DPDCDEBUG -w-par
 !else
 CFLAGS		= -O -w-par
 !endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) #-DPDC_WIDE
+!if $d(WIDE)
+CPPFLAGS	= -I$(PDCURSES_HOME) -DPDC_WIDE
+!else
+CPPFLAGS	= -I$(PDCURSES_HOME)
+!endif
 
 BUILD		= $(CC) -c -Tpe -w32 $(CFLAGS) $(CPPFLAGS)
 
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index d849a766..629b5265 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -2,7 +2,7 @@
 #
 # GNU MAKE Makefile for PDCurses library - WIN32 Cygnus GCC
 #
-# Usage: make -f [path\]gccwin32.mak [-DDEBUG] [target]
+# Usage: make -f [path\]gccwin32.mak [DEBUG=Y] [WIDE=Y] [target]
 #
 # where target can be any of:
 # [all|demos|pdcurses.a|panel.a|testcurs.exe...]
@@ -37,7 +37,11 @@ else
 	LDFLAGS =
 endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) #-DPDC_WIDE
+ifeq ($(WIDE),Y)
+	CPPFLAGS = -I$(PDCURSES_HOME) -DPDC_WIDE
+else
+	CPPFLAGS = -I$(PDCURSES_HOME)
+endif
 
 CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
 
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index b9fb9637..d738b6a7 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -2,7 +2,7 @@
 #
 # GNU MAKE Makefile for PDCurses library - WIN32 MinGW GCC
 #
-# Usage: make -f [path\]gccwin32.mak [-DDEBUG] [target]
+# Usage: make -f [path\]gccwin32.mak [DEBUG=Y] [WIDE=Y] [target]
 #
 # where target can be any of:
 # [all|demos|pdcurses.a|panel.a|testcurs.exe...]
@@ -37,7 +37,11 @@ else
 	LDFLAGS =
 endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) -DPDC_WIDE
+ifeq ($(WIDE),Y)
+	CPPFLAGS = -I$(PDCURSES_HOME) -DPDC_WIDE
+else
+	CPPFLAGS = -I$(PDCURSES_HOME)
+endif
 
 CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
 
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index 47fe2c94..959d4aa7 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -2,7 +2,7 @@
 #
 # Watcom WMAKE Makefile for PDCurses library - Win32 Watcom C/C++ 10.6+
 #
-# Usage: wmake -f [win32\]wccwin32.mak [DEBUG=Y] [target]
+# Usage: wmake -f [win32\]wccwin32.mak [DEBUG=Y] [WIDE=Y] [target]
 #
 # where target can be any of:
 # [all|demos|pdcurses.lib|panel.lib|testcurs.exe...]
@@ -33,7 +33,12 @@ CFLAGS		= /oneatx
 LDFLAGS		= op q sys $(TARGET)
 !endif
 
-CPPFLAGS	= /i=$(PDCURSES_HOME) #/DPDC_WIDE
+!ifeq WIDE Y
+CPPFLAGS	= /i=$(PDCURSES_HOME) /DPDC_WIDE
+!else
+CPPFLAGS	= /i=$(PDCURSES_HOME)
+!endif
+
 CCFLAGS		= /ei /zq /wx $(CFLAGS) $(CPPFLAGS)
 
 LIBEXE		= wlib /q /n /t