fix building on Windows with Open Watcom, using OWWIN helper tools built as win32 executables instead of DOS executables as done using WATCOM for COMPILER

This commit is contained in:
Kenneth J Davis 2022-06-03 23:28:51 -04:00
parent 9343e00f9a
commit bfd5328183
No known key found for this signature in database
GPG Key ID: 59D5F216C38F11FD
3 changed files with 7 additions and 3 deletions

View File

@ -41,8 +41,10 @@ set COMPILER=BC3
:- set COMPILER=BC5
:- Microsoft C
:- set COMPILER=MSCL8
:- Watcom C
:- Watcom C (for DOS)
:- set COMPILER=WATCOM
:- Watcom C (for Windows)
:- set COMPILER=OWWIN
:-**********************************************************************
:-- where is the BASE dir of your compiler(s) ??

View File

@ -26,6 +26,7 @@ if "%COMPILER%" == "TC3" set MAKE=%TC3_BASE%\bin\make
if "%COMPILER%" == "BC3" set MAKE=%BC3_BASE%\bin\make
if "%COMPILER%" == "BC5" set MAKE=%BC5_BASE%\bin\make
if "%COMPILER%" == "WATCOM" set MAKE=wmake /ms /h
if "%COMPILER%" == "OWWIN" set MAKE=wmake /ms /h
if "%COMPILER%" == "MSCL8" set MAKE=%MS_BASE%\bin\nmake /nologo
echo Make is %MAKE%.
@ -42,6 +43,7 @@ if "%COMPILER%" == "TC3" set XLINK=%TC3_BASE%\bin\tlink /m/c
if "%COMPILER%" == "BC3" set XLINK=%BC3_BASE%\bin\tlink /m/c
if "%COMPILER%" == "BC5" set XLINK=%BC5_BASE%\bin\tlink /m/c
if "%COMPILER%" == "WATCOM" set XLINK=..\utils\wlinker /ma/nologo
if "%COMPILER%" == "OWWIN" set XLINK=..\utils\wlinker /ma/nologo
if "%COMPILER%" == "MSCL8" set XLINK=%MS_BASE%\bin\link /ONERROR:NOEXE /ma /nologo
echo Linker is %XLINK%.

View File

@ -17,5 +17,5 @@ CLT=owcc -DDOSC_TIME_H -DBUILD_UTILS -I../hdr -o $@
CLC=$(CLT)
CFLAGST=-fo=.obj $(CFLAGST)
ALLCFLAGS=-fo=.obj $(ALLCFLAGS)
NASMFLAGS=-Dowlinux $(NASMFLAGS)
XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ..$(DIRSEP)lib$(DIRSEP)device.lib N kernel.exe $#
NASMFLAGS=-DWATCOM $(NASMFLAGS)
#XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ..$(DIRSEP)lib$(DIRSEP)device.lib N kernel.exe $#