From 62e1f867dbc96863acd20652ed1281a0a4c19256 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sun, 18 Dec 2005 00:01:53 +0000
Subject: [PATCH] Simplified Borland makefiles, removing the need to edit them.
 I believe that calling the linker directly was meant to speed up the build,
 but I think the savings in configuration time is probably of more value now.

---
 INSTALL            | 16 ++++++----------
 dos/bccdos.mak     | 25 ++++++++-----------------
 os2/bccos2.mak     | 26 ++++++++------------------
 win32/bccwin32.mak | 32 +++++++-------------------------
 4 files changed, 29 insertions(+), 70 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9998892d..743f29e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,9 +24,8 @@
          owos2.mak  - OpenWatcom
          wccos2.mak - Watcom 10.6+
 
- . Borland users may have to edit bccos2.mak to point CC_HOME at the 
-   directory where they installed their compiler. Watcom users may have 
-   to set CCINCDIR to the directory containing os2.h.
+ . Watcom users may have to set CCINCDIR to the directory containing 
+   os2.h.
 
  . Build it:
 
@@ -54,10 +53,8 @@
          wccdos16.mak - Watcom 10.6+ (16bit)
          wccdos4g.mak - Watcom 10.6+ (32bit)
 
- . Borland users may have to edit bccdos.mak to point CC_HOME at the 
-   directory where they installed their compiler. For 16-bit compilers, 
-   you may also want to change the memory MODEL. (Large model is the 
-   default, and recommended.)
+ . For 16-bit compilers, you may also want to change the memory MODEL. 
+   (Large model is the default, and recommended.)
 
  . Build it:
 
@@ -86,9 +83,8 @@
          vcwin32.mak    - Visual C++ 2.0+
          wccwin32.mak   - Watcom 10.6+
 
- . Borland users may have to edit bccwin32.mak to point CC_HOME at the 
-   directory where they installed their compiler. LCC users will have to
-   edit lccwin32.mak to point PDCURSES_HOME to the PDCurses directory.
+ . LCC users will have to edit lccwin32.mak to point PDCURSES_HOME to 
+   the PDCurses directory.
 
  . Build it:
 
diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index 97571b97..214580ed 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -13,7 +13,6 @@
 #
 ################################################################################
 PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-CC_HOME		=c:\c
 MODEL		=l
 ################################################################################
 # Nothing below here should require changing.
@@ -26,9 +25,6 @@ PDCURSES_CURSPRIV_H		=$(PDCURSES_HOME)\curspriv.h
 PDCURSES_HEADERS		=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		=$(PDCURSES_HOME)\panel.h
 
-CCLIBDIR		=$(CC_HOME)\lib
-CCINCDIR		=$(CC_HOME)\include
-
 srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\dos
 pandir		= $(PDCURSES_HOME)\panel
@@ -38,21 +34,16 @@ demodir		= $(PDCURSES_HOME)\demos
 
 !if $d(DEBUG)
 CFLAGS  = -N -v -y -DPDCDEBUG 
-LDFLAGS = /c /v /s /l /e
 !else
 CFLAGS  = -O 
-LDFLAGS = 
 !endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR)
+CPPFLAGS	= -I$(PDCURSES_HOME)
 
-CCFLAGS		= -c +bccdos.rsp -m$(MODEL) $(CFLAGS) $(CPPFLAGS)
+CCFLAGS		= -c @bccdos.rsp -m$(MODEL) $(CFLAGS) $(CPPFLAGS)
 
 LINK		= tlink
 
-CCLIBS		=$(CCLIBDIR)\c$(MODEL).lib
-STARTUP	=$(CCLIBDIR)\c0$(MODEL).obj
-
 LIBEXE		= tlib /C /E
 
 LIBCURSES	= pdcurses.lib
@@ -288,22 +279,22 @@ panel.obj: $(pandir)\panel.c $(PDCURSES_HEADERS) $(PANEL_HEADER)
 #------------------------------------------------------------------------
 
 firework.exe:	firework.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 newdemo.exe:	newdemo.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 ptest.exe:	ptest.obj $(LIBCURSES) $(LIBPANEL)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBPANEL)+$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 testcurs.exe:	testcurs.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj+tui.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 xmas.exe:	xmas.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 
 firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H)
diff --git a/os2/bccos2.mak b/os2/bccos2.mak
index c4bd9ac7..eb7b5321 100644
--- a/os2/bccos2.mak
+++ b/os2/bccos2.mak
@@ -13,7 +13,6 @@
 #
 ################################################################################
 PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-CC_HOME		=c:\bcos2
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
@@ -25,9 +24,6 @@ PDCURSES_CURSPRIV_H		=$(PDCURSES_HOME)\curspriv.h
 PDCURSES_HEADERS		=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		=$(PDCURSES_HOME)\panel.h
 
-CCLIBDIR		=$(CC_HOME)\lib
-CCINCDIR		=$(CC_HOME)\include
-
 srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\os2
 pandir		= $(PDCURSES_HOME)\panel
@@ -37,29 +33,23 @@ CC		= bcc
 
 !if $d(DEBUG)
 CFLAGS  = -N -v -y -DPDCDEBUG 
-LDFLAGS = /c /v /s /l /e
 !else
 CFLAGS  = -O 
-LDFLAGS = 
 !endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR)
+CPPFLAGS	= -I$(PDCURSES_HOME)
 
 CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS)
 
 LINK		= tlink
 
-#CCLIBS		=$(CCLIBDIR)\c2.lib
-CCLIBS		=c2.lib+os2.lib
-STARTUP	=$(CCLIBDIR)\c02.obj
-
 LIBEXE		= tlib /C /E
 
 LIBCURSES	= pdcurses.lib
 LIBPANEL	= panel.lib
 
 PDCLIBS	= $(LIBCURSES) $(LIBPANEL)
-DEMOS	=testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe
+DEMOS	=testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe ptest.exe
 
 ################################################################################
 all:	$(PDCLIBS) $(DEMOS)
@@ -287,22 +277,22 @@ panel.obj: $(pandir)\panel.c $(PDCURSES_HEADERS) $(PANEL_HEADER)
 #------------------------------------------------------------------------
 
 firework.exe:	firework.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 newdemo.exe:	newdemo.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 ptest.exe:	ptest.obj $(LIBCURSES) $(LIBPANEL)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBPANEL)+$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 testcurs.exe:	testcurs.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj+tui.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 xmas.exe:	xmas.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*.obj,$*,,$(LIBCURSES)+$(CCLIBS);
+	$(CC) -e$@ $**
 
 
 firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H)
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index 9ac4950d..1e753154 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -13,7 +13,6 @@
 #
 ################################################################################
 PDCURSES_HOME		=$(PDCURSES_SRCDIR)
-CC_HOME		=c:\bcc55
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
@@ -25,39 +24,23 @@ PDCURSES_CURSPRIV_H		=$(PDCURSES_HOME)\curspriv.h
 PDCURSES_HEADERS		=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		=$(PDCURSES_HOME)\panel.h
 
-CCLIBDIR		=$(CC_HOME)\lib
-#CCLIBDIR		=f:lib
-CCINCDIR		=$(CC_HOME)\include
-
 srcdir		= $(PDCURSES_HOME)\pdcurses
 osdir		= $(PDCURSES_HOME)\win32
 pandir		= $(PDCURSES_HOME)\panel
 demodir		= $(PDCURSES_HOME)\demos
 
-CC		= bcc32
+CC		= bcc32 -q
 
 !if $d(DEBUG)
 CFLAGS  = -N -v -y -DPDCDEBUG
-LDFLAGS = /c /v /s /l /e
 !else
 CFLAGS  =  -O -w-eff -w-par
-LDFLAGS =
 !endif
 
-!if $(__MAKE__) < 0x0520
 CPPFLAGS	= -I$(PDCURSES_HOME)
-LINK		= tlink32 -L$(CCLIBDIR)
-CCLIBS = bidsf+import32+cw32
-!else
-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR)
-LINK		= ilink32 -L$(CCLIBDIR)
-CCLIBS = import32.lib+cw32.lib
-!endif
 
 CCFLAGS		= -c -Tpe -w32 $(CFLAGS) $(CPPFLAGS)
 
-STARTUP	=$(CCLIBDIR)\c0x32.obj
-
 LIBEXE		= tlib /C /E
 
 LIBCURSES	= pdcurses.lib
@@ -74,7 +57,6 @@ clean:
 	-del *.lib
 	-del *.map
 	-del *.tds
-	-del *.il?
 	-del *.exe
 
 demos:	$(DEMOS)
@@ -298,22 +280,22 @@ panel.obj: $(pandir)\panel.c $(PDCURSES_HEADERS) $(PANEL_HEADER)
 #------------------------------------------------------------------------
 
 firework.exe:	firework.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*,$*,,$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 newdemo.exe:	newdemo.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*,$*,,$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 ptest.exe:	ptest.obj $(LIBCURSES) $(LIBPANEL)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*,$*,,$(LIBPANEL)+$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 testcurs.exe:	testcurs.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*,$*,,$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 tuidemo.exe:	tuidemo.obj tui.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*+tui,$*,,$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 xmas.exe:	xmas.obj $(LIBCURSES)
-	$(LINK) $(LDFLAGS) $(STARTUP)+$*,$*,,$(LIBCURSES)+$(CCLIBS)
+	$(CC) -e$@ $**
 
 
 firework.obj: $(demodir)\firework.c $(PDCURSES_CURSES_H)