enable building with tc2 and tc3 with alternate paths

Author: PerditionC

build.bat

@@ -1,32 +1,44 @@
+@ECHO OFF
 rem Call this batch file with an argument of tcc3 or tcc2 to select compiler
+IF NOT [%2]==[] SET BASEPATH=%2
+IF [%2]==[] SET BASEPATH=
+IF NOT [%3]==[] SET MAKE=%3
+IF [%3]==[] SET MAKE=make
+IF [%1]==[] goto help
+SET OLD_PATH=%PATH%
 goto %1
 
+:help
+ECHO build tcc# [tcpath] [make]
+ECHO e.g.
+ECHO build tcc2 D:\tc201 d:\dgjpp\bin\make
+ECHO or
+ECHO build tcc3 D:\tc30
+ECHO.
+ECHO Note: ensure UPX is in your path, optionally make in C:\bin
+goto end
+
 :tcc2
 rem ############# Turbo C 2.01 ########################
-set PATH=C:\bin;C:\tc201;%PATH%
-set LIBS=C:\tc201\lib
-set CC=tcc
-set LD=tlink
-rem Small
-rem set COPT=-c -ms -1 share.c
-rem set LOPT=/m /s /c $(LIBS)\c0s.obj share.obj,share.com,,$(LIBS)\cs.lib
-rem Tiny
-set CFLAGS=-mt -1 -c -o
-set LDFLAGS=/m /s /c /t $(LIBS)\c0t.obj $(EXTRA_OBJS) share.obj,share.com,,$(LIBS)\cs.lib
-rem tcc looks for includes from the current directory, not the location of the
-rem file that's trying to include them, so add kitten's location
-set CFLAGS=-I../kitten -I../tnyprntf %CFLAGS%
-goto doit
+IF [%BASEPATH%]==[] set BASEPATH=C:\tc201
+set PATH=C:\bin;%BASEPATH%;%PATH%
+goto tcshared
 
 :tcc3
 rem ############# TURBO_C 3 ########################
-set PATH=C:\bin;C:\tc\bin;%PATH%
-set LIBS=C:\tc\lib
+IF [%BASEPATH%]==[] set BASEPATH=C:\tc
+set PATH=C:\bin;%BASEPATH%\bin;%PATH%
+rem TC3 may create relocation records, if so use Small memory model
+goto tcshared
+
+:tcshared
+rem ############# TURBO_C shared ########################
+set LIBS=%BASEPATH%\lib
+set INCLUDE=%BASEPATH%/include
 set CC=tcc
 set LD=tlink
-rem Tiny
-set COPT=-c -mt -1 share.c
-set LOPT=/m /s /c /t -L$(LIBS) c0t.obj share.obj,share.com,,cs.lib
+set LDFLAGS=/m /s /c /t $(LIBS)\c0t.obj $(EXTRA_OBJS) share.obj,share.com,,$(LIBS)\cs.lib
+set CFLAGS=-I../kitten -I../tnyprntf -I%INCLUDE% -mt -1 -c -o
 goto doit
 
 :doit
@@ -51,4 +63,18 @@ rem   or
 rem     --best for smallest
 
 rem We use GNU make for all targets
-make -C src
+%MAKE% -C src
+
+rem cleanup
+:end
+set PATH=%OLD_PATH%
+set MAKE=
+set BASEPATH=
+set INCLUDE=
+set LIBS=
+set CC=
+set CFLAGS=
+set LD=
+set LDFLAGS=
+set EXTRA_OBJS=
+set UPXARGS=

src/Makefile

@@ -21,8 +21,16 @@ endif
 share.obj: share.c
 	$(CC) $(CFLAGS)$@ $^
 
+ifeq "$(COMPILER)" "gcc"
 gcc_help.obj: gcc_help.asm
 	nasm -f elf -I ../lmacros/ -I lmacros/ $< -o $@
+else
+kitten.obj: ../kitten/kitten.c
+	$(CC) $(CFLAGS)$@ $^
+
+tnyprntf.obj: ../tnyprntf/tnyprntf.c
+	$(CC) $(CFLAGS)$@ $^
+endif
 
 share.com: share.obj $(EXTRA_OBJS)
 	$(LD) $(LDFLAGS)

src/share.c

@@ -1164,7 +1164,14 @@ int main(int argc, char **argv) {
 	setvect(0x2D, i2D_handler);
 #endif
 	old_handler2f = getvect(MUX_INT_NO);
+#if 0 /* causes relocations when built with Turbo C/C++ 3 */
 	setvect(MUX_INT_NO,handler2f);
+#else
+	{
+		void (near *isr)() = FP_OFF(handler2f);
+		setvect(MUX_INT_NO,(void (interrupt far *)())MK_FP(_DS,isr));
+	}
+#endif
 	/* enable(); */
 
 		/* Let them know we're installed. */