From 7836363019bc0f17253be0f794c40ec21965ad68 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Sat, 21 Feb 2015 11:23:03 +0100
Subject: [PATCH] Use a Makefile for the 16-bit part of the build process

Well, that became unbearable pretty quickly. Not sure whether I'm doing all
this Makefile business right, but this looks pretty nice.

It doesn't really help much at this point though because the 32-bit part is
still entirely separate and forces everything to rebuild all the time, but at
least it aborts on C compiler errors.
---
 Makefile.mak | 29 +++++++++++++++++++++++++++++
 build16b.bat | 34 +++++++---------------------------
 2 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100644 Makefile.mak

diff --git a/Makefile.mak b/Makefile.mak
new file mode 100644
index 00000000..38259f19
--- /dev/null
+++ b/Makefile.mak
@@ -0,0 +1,29 @@
+# ReC98
+# -----
+# Makefile for the 16-bit part of the build process
+
+CFLAGS = -ls -Ilibs\master.lib\ -Lbin\
+
+TH01 = \zunsoft.com \op.exe \reiiden.exe \fuuin.exe
+TH02 = \zuninit.com \zun_res.com \op.exe \main.exe \maine.exe
+TH03 = \zunsp.com \res_yume.com \op.exe \main.exe \mainl.exe
+TH04 = \res_huma.com \op.exe \main.exe \maine.exe
+TH05 = \res_kso.com \op.exe \main.exe \maine.exe
+
+all: th01 th02 th03 th04 th05
+	@echo Done. Find the executables in the bin\ subdirectory.
+
+th01:: $(TH01:\=bin\th01\)
+th02:: $(TH02:\=bin\th02\)
+th03:: $(TH03:\=bin\th03\)
+th04:: $(TH04:\=bin\th04\)
+th05:: $(TH05:\=bin\th05\)
+
+.obj.exe:
+	$(CC) $(CFLAGS) -ml $**
+
+.obj.com:
+	tlink /t /3 $**
+
+bin\th01\zunsoft.com: th01\zunsoft.c
+	$(CC) $(CFLAGS) -mt -lt -O -a2 -nbin\th01\ $** masters.lib
diff --git a/build16b.bat b/build16b.bat
index 04241195..4320312b 100644
--- a/build16b.bat
+++ b/build16b.bat
@@ -4,10 +4,7 @@ echo If this fails or shows other weird behavior, run BUILD16B separately in DOS
 REM (Yes, we don't use %0%, as it actually has to be %0 on DOS. Just spelling
 REM out the name saves us that trouble.)
 
-set ReC98_CC=tcc -ls -Ilibs\master.lib\ -Lbin\
-set ReC98_LINK=tlink
-
-%ReC98_LINK% 1>NUL 2>NUL
+tlink 1>NUL 2>NUL
 if errorlevel 9009 goto no_tlink
 if errorlevel 216 goto 64_bit
 
@@ -15,29 +12,9 @@ tcc 1>NUL 2>NUL
 if errorlevel 9009 goto no_tcc
 if errorlevel 216 goto 64_bit
 
-%ReC98_CC% -mt -lt -O -a2 -nbin\th01\ th01\zunsoft.c masters.lib
-%ReC98_CC% -ml bin\th01\op.obj
-%ReC98_CC% -ml bin\th01\reiiden.obj
-%ReC98_CC% -ml bin\th01\fuuin.obj
-%ReC98_LINK% /t bin\th02\zuninit.obj
-%ReC98_LINK% /t bin\th02\zun_res.obj
-%ReC98_CC% -ml bin\th02\op.obj
-%ReC98_CC% -ml bin\th02\main.obj
-%ReC98_CC% -ml bin\th02\maine.obj
-%ReC98_LINK% /t /3 bin\th03\zunsp.obj
-%ReC98_LINK% /t bin\th03\res_yume.obj
-%ReC98_CC% -ml bin\th03\op.obj
-%ReC98_CC% -ml bin\th03\main.obj
-%ReC98_CC% -ml bin\th03\mainl.obj
-%ReC98_LINK% /t bin\th04\res_huma.obj
-%ReC98_CC% -ml bin\th04\op.obj
-%ReC98_CC% -ml bin\th04\main.obj
-%ReC98_CC% -ml bin\th04\maine.obj
-%ReC98_LINK% /t bin\th05\res_kso.obj
-%ReC98_CC% -ml bin\th05\op.obj
-%ReC98_CC% -ml bin\th05\main.obj
-%ReC98_CC% -ml bin\th05\maine.obj
-echo Done. Find the executables in the bin\ subdirectory.
+make
+if errorlevel 9009 goto no_make
+if errorlevel 216 goto 64_bit
 goto eof
 
 :64_bit
@@ -50,6 +27,9 @@ goto tc4j_bin
 :no_tlink
 echo Could not find TLINK.
 goto tc4j_bin
+:no_make
+echo Could not find MAKE.
+goto tc4j_bin
 :tc4j_bin
 echo Please make sure that the BIN directory of Turbo C++ 4.0J is in your PATH.
 goto eof