From 0231c98e3fdb86d04bb71923cd62f948f8e285a7 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Mon, 15 Jul 2024 12:36:27 +0200
Subject: [PATCH] ow-build: add global compiler control option to CC and CL
 macros

move only options which is related to the host environment not for target
-zq quiet output (all)
-fo=.obj set default extension for object file to .obj instead .o (Linux only)
---
 mkfiles/owlinux.mak |  8 ++++----
 mkfiles/owwin.mak   |  4 +---
 mkfiles/watcom.mak  | 10 +++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mkfiles/owlinux.mak b/mkfiles/owlinux.mak
index cc3b941..0cf9f78 100644
--- a/mkfiles/owlinux.mak
+++ b/mkfiles/owlinux.mak
@@ -6,14 +6,14 @@
 include "../mkfiles/watcom.mak"
 
 DIRSEP=/
+CC=$(CC) -fo=.obj
+CL=$(CL) -fo=.obj
 INCLUDEPATH=$(COMPILERPATH)/h
 RM=rm -f
 CP=cp
 ECHOTO=echo>>
 INITPATCH=@echo > /dev/null
 CLDEF=1
-CLT=wcl386 -zq -bcl=linux -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
+CLT=wcl386 -zq -fo=.obj -bcl=linux -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
 CLC=$(CLT)
-CFLAGST=-fo=.obj $(CFLAGST)
-ALLCFLAGS=-fo=.obj $(ALLCFLAGS) 
-XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ../lib/device.lib N kernel.exe $#
+XLINK=$(XLINK) debug all format dos opt quiet,symfile,map,statics,verbose F { $(OBJS) } L ../lib/device.lib N kernel.exe $#
diff --git a/mkfiles/owwin.mak b/mkfiles/owwin.mak
index 26fae5b..d7bce6a 100644
--- a/mkfiles/owwin.mak
+++ b/mkfiles/owwin.mak
@@ -15,7 +15,5 @@ INCLUDEPATH=$(COMPILERPATH)\h
 CLDEF=1
 CLT=wcl386 -zq -bcl=nt -I..\hdr -fe=$@ -I$(COMPILERPATH)\h -I$(COMPILERPATH)\h\nt
 CLC=$(CLT)
-CFLAGST=-fo=.obj $(CFLAGST)
-ALLCFLAGS=-fo=.obj $(ALLCFLAGS) 
 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 $#
+XLINK=$(XLINK) debug all format dos opt quiet,symfile,map,statics,verbose F { $(OBJS) } L ..$(DIRSEP)lib$(DIRSEP)device.lib N kernel.exe $#
diff --git a/mkfiles/watcom.mak b/mkfiles/watcom.mak
index fe68c5a..f16e975 100644
--- a/mkfiles/watcom.mak
+++ b/mkfiles/watcom.mak
@@ -4,8 +4,8 @@
 
 # Use these for WATCOM 11.0c
 COMPILERPATH=$(WATCOM)
-CC=*wcc
-CL=wcl
+CC=*wcc -zq
+CL=wcl -zq
 INCLUDEPATH=$(COMPILERPATH)\H
 INCLUDE=$(COMPILERPATH)\h 
 EDPATH=$(COMPILERPATH)\EDDAT
@@ -22,8 +22,8 @@ LIBPLUS=
 LIBTERM=
 
 TINY=-mt
-CFLAGST=-zq-zp1-os-s-we-e3-wx-bt=DOS
-CFLAGSC=-mc-zq-zp1-os-s-we-e3-wx-bt=DOS
+CFLAGST=-zp1-os-s-we-e3-wx-bt=DOS
+CFLAGSC=-mc-zp1-os-s-we-e3-wx-bt=DOS
 
 TARGET=KWC
 
@@ -61,7 +61,7 @@ MATH_INSERT=+i4m
 # -3		optimization for 386 - given in CONFIG.MAK, not here
 #
 
-ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS) -zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-r
+ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS) -os-s-e5-j-zl-zp1-wx-we-zgf-zff-r
 INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-gTGROUP-ndI
 CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT