Skip to content

Commit 0231c98

Browse files
jmalakPerditionC
authored andcommitted
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)
1 parent c0009eb commit 0231c98

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

mkfiles/owlinux.mak

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
include "../mkfiles/watcom.mak"
77

88
DIRSEP=/
9+
CC=$(CC) -fo=.obj
10+
CL=$(CL) -fo=.obj
911
INCLUDEPATH=$(COMPILERPATH)/h
1012
RM=rm -f
1113
CP=cp
1214
ECHOTO=echo>>
1315
INITPATCH=@echo > /dev/null
1416
CLDEF=1
15-
CLT=wcl386 -zq -bcl=linux -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
17+
CLT=wcl386 -zq -fo=.obj -bcl=linux -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
1618
CLC=$(CLT)
17-
CFLAGST=-fo=.obj $(CFLAGST)
18-
ALLCFLAGS=-fo=.obj $(ALLCFLAGS)
19-
XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ../lib/device.lib N kernel.exe $#
19+
XLINK=$(XLINK) debug all format dos opt quiet,symfile,map,statics,verbose F { $(OBJS) } L ../lib/device.lib N kernel.exe $#

mkfiles/owwin.mak

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ INCLUDEPATH=$(COMPILERPATH)\h
1515
CLDEF=1
1616
CLT=wcl386 -zq -bcl=nt -I..\hdr -fe=$@ -I$(COMPILERPATH)\h -I$(COMPILERPATH)\h\nt
1717
CLC=$(CLT)
18-
CFLAGST=-fo=.obj $(CFLAGST)
19-
ALLCFLAGS=-fo=.obj $(ALLCFLAGS)
2018
NASMFLAGS=-DWATCOM $(NASMFLAGS)
21-
#XLINK=$(XLINK) debug all op symfile format dos option map,statics,verbose F { $(OBJS) } L ..$(DIRSEP)lib$(DIRSEP)device.lib N kernel.exe $#
19+
XLINK=$(XLINK) debug all format dos opt quiet,symfile,map,statics,verbose F { $(OBJS) } L ..$(DIRSEP)lib$(DIRSEP)device.lib N kernel.exe $#

mkfiles/watcom.mak

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# Use these for WATCOM 11.0c
66
COMPILERPATH=$(WATCOM)
7-
CC=*wcc
8-
CL=wcl
7+
CC=*wcc -zq
8+
CL=wcl -zq
99
INCLUDEPATH=$(COMPILERPATH)\H
1010
INCLUDE=$(COMPILERPATH)\h
1111
EDPATH=$(COMPILERPATH)\EDDAT
@@ -22,8 +22,8 @@ LIBPLUS=
2222
LIBTERM=
2323

2424
TINY=-mt
25-
CFLAGST=-zq-zp1-os-s-we-e3-wx-bt=DOS
26-
CFLAGSC=-mc-zq-zp1-os-s-we-e3-wx-bt=DOS
25+
CFLAGST=-zp1-os-s-we-e3-wx-bt=DOS
26+
CFLAGSC=-mc-zp1-os-s-we-e3-wx-bt=DOS
2727

2828
TARGET=KWC
2929

@@ -61,7 +61,7 @@ MATH_INSERT=+i4m
6161
# -3 optimization for 386 - given in CONFIG.MAK, not here
6262
#
6363

64-
ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS) -zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-r
64+
ALLCFLAGS=-I..$(DIRSEP)hdr $(TARGETOPT) $(ALLCFLAGS) -os-s-e5-j-zl-zp1-wx-we-zgf-zff-r
6565
INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-gTGROUP-ndI
6666
CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT
6767

0 commit comments

Comments
 (0)