include-path: correct compiler include path list

remove duplicit hdr path now CLT and CLC macros hold necessary include path list for DOS or host OS (cross-compile)
FDOS · Jul 16, 2024 · badb66c · badb66c
1 parent db43a4b
commit badb66c
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 25 deletions.
diff --git a/mkfiles/bc3.mak b/mkfiles/bc3.mak
@@ -8,7 +8,7 @@ COMPILERPATH=$(BC3_BASE)
 COMPILERBIN=$(COMPILERPATH)\bin
 CC=$(COMPILERBIN)\bcc -c
 CL=$(COMPILERBIN)\bcc
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 LIBUTIL=$(COMPILERBIN)\tlib
 LIBPATH=$(COMPILERPATH)\lib
 LIBTERM=

diff --git a/mkfiles/bc5.mak b/mkfiles/bc5.mak
@@ -8,7 +8,7 @@ COMPILERPATH=$(BC5_BASE)
 COMPILERBIN=$(COMPILERPATH)\bin
 CC=$(COMPILERBIN)\bcc -c
 CL=$(COMPILERBIN)\bcc
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 LIBUTIL=$(COMPILERBIN)\tlib
 LIBPATH=$(COMPILERPATH)\lib
 LIBTERM=  

diff --git a/mkfiles/gcc.mak b/mkfiles/gcc.mak
@@ -29,7 +29,6 @@ NASMFLAGS+=-i../hdr/ -DXCPU=$(XCPU) -felf
 
 CC=ia16-elf-gcc -c
 CL=ia16-elf-gcc
-INCLUDEPATH=.
 
 LIBUTIL=ar crs
 LIBPLUS=

diff --git a/mkfiles/generic.mak b/mkfiles/generic.mak
@@ -40,8 +40,8 @@ LOADSEG=0x60
 !include "../mkfiles/$(COMPILER).mak"
 
 !if $(CLDEF) == 0
-CLT=$(CL) $(CFLAGST) $(TINY) -I$(INCLUDEPATH)
-CLC=$(CL) $(CFLAGSC) -I$(INCLUDEPATH)
+CLT=$(CL) $(CFLAGST) $(TINY) -I..\hdr $(INCLUDEPATH)
+CLC=$(CL) $(CFLAGSC) -I..\hdr $(INCLUDEPATH)
 !endif
 
 TARGET=$(TARGET)$(XCPU)$(XFAT)

diff --git a/mkfiles/mscl8.mak b/mkfiles/mscl8.mak
@@ -5,20 +5,17 @@
 # Use these for MSCV 1.52
 COMPILERPATH=$(MS_BASE)
 COMPILERBIN=$(COMPILERPATH)\bin
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 CC=$(COMPILERBIN)\cl -c
 CL=$(COMPILERBIN)\cl
 TINY=
 CFLAGST=/Fm /AT /Os /Zp1
 CFLAGSC=/Fm /AL /Os /Zp1
 LIBPATH=$(COMPILERPATH)\lib
-LIB=$(COMPILERPATH)\lib
-INCLUDE=$(COMPILERPATH)\include
+LIB=$(LIBPATH)
 LIBUTIL=$(COMPILERBIN)\lib /nologo
 LIBPLUS=+
 LIBTERM=;
-INCLUDE=$(COMPILERPATH)\include
-LIB=$(COMPILERPATH)\lib
 
 # used for building the library
 

diff --git a/mkfiles/owlinux.mak b/mkfiles/owlinux.mak
@@ -8,12 +8,13 @@ include "../mkfiles/watcom.mak"
 DIRSEP=/
 CC=$(CC) -fo=.obj
 CL=$(CL) -fo=.obj
-INCLUDEPATH=$(COMPILERPATH)/h
+INCLUDEPATH=-I$(COMPILERPATH)/h
+EDPATH=$(COMPILERPATH)/eddat
 RM=rm -f
 CP=cp
 ECHOTO=echo>>
 INITPATCH=@echo > /dev/null
 CLDEF=1
-CLT=wcl386 -zq -fo=.obj -bcl=linux -I../hdr -fe=$@ -I$(COMPILERPATH)/lh
+CLT=wcl386 -zq -fo=.obj -bcl=linux -fe=$@ -I../hdr -I$(COMPILERPATH)/lh
 CLC=$(CLT)
 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
@@ -7,13 +7,12 @@ include "../mkfiles/watcom.mak"
 
 DIRSEP=\ 
 
-INCLUDEPATH=$(COMPILERPATH)\h
 #RM=del 2>nul
 #CP=copy
 #ECHOTO=echo>>
 #INITPATCH=@echo > nul
 CLDEF=1
-CLT=wcl386 -zq -bcl=nt -I..\hdr -fe=$@ -I$(COMPILERPATH)\h -I$(COMPILERPATH)\h\nt
+CLT=wcl386 -zq -bcl=nt -fe=$@ -I..\hdr -I$(COMPILERPATH)\h -I$(COMPILERPATH)\h\nt
 CLC=$(CLT)
 NASMFLAGS=-DWATCOM $(NASMFLAGS)
 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/tc2.mak b/mkfiles/tc2.mak
@@ -8,7 +8,7 @@ COMPILERPATH=$(TC2_BASE)
 COMPILERBIN=$(COMPILERPATH)
 CC=$(COMPILERBIN)\tcc -c
 CL=$(COMPILERBIN)\tcc
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 LIBUTIL=$(COMPILERBIN)\tlib
 LIBPATH=$(COMPILERPATH)\lib
 LIBTERM=  

diff --git a/mkfiles/tc3.mak b/mkfiles/tc3.mak
@@ -8,7 +8,7 @@ COMPILERPATH=$(TC3_BASE)
 COMPILERBIN=$(COMPILERPATH)\bin
 CC=$(COMPILERBIN)\tcc -c
 CL=$(COMPILERBIN)\tcc
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 LIBUTIL=$(COMPILERBIN)\tlib
 LIBPATH=$(COMPILERPATH)\lib
 LIBTERM=  

diff --git a/mkfiles/turbocpp.mak b/mkfiles/turbocpp.mak
@@ -8,7 +8,7 @@ COMPILERPATH=$(TP1_BASE)
 COMPILERBIN=$(COMPILERPATH)\bin
 CC=$(COMPILERBIN)\tcc -c
 CL=$(COMPILERBIN)\tcc
-INCLUDEPATH=$(COMPILERPATH)\include
+INCLUDEPATH=-I$(COMPILERPATH)\include
 LIBUTIL=$(COMPILERBIN)\tlib
 LIBPATH=$(COMPILERPATH)\lib
 LIBTERM=  

diff --git a/mkfiles/watcom.mak b/mkfiles/watcom.mak
@@ -6,9 +6,8 @@
 COMPILERPATH=$(WATCOM)
 CC=*wcc -zq
 CL=wcl -zq
-INCLUDEPATH=$(COMPILERPATH)\H
-INCLUDE=$(COMPILERPATH)\h 
-EDPATH=$(COMPILERPATH)\EDDAT
+INCLUDEPATH=-I$(COMPILERPATH)\h
+EDPATH=$(COMPILERPATH)\eddat
 
 !if $(XCPU) != 186
 !if $(XCPU) != 386

diff --git a/sys/makefile b/sys/makefile
@@ -6,7 +6,7 @@
 
 !include "../mkfiles/generic.mak"
 
-CFLAGS = -I$(INCLUDEPATH) -I..$(DIRSEP)hdr -DFORSYS -DWITHFAT32 $(CFLAGST)
+CFLAGS = -DFORSYS -DWITHFAT32 $(CFLAGST) -I. -I..$(DIRSEP)hdr $(INCLUDEPATH)
 NASMFLAGS = -DSYS=1
 
 #		*List Macros*

diff --git a/utils/makefile b/utils/makefile
@@ -1,11 +1,9 @@
 !include "../mkfiles/generic.mak"
 
-CFLAGS = -I..$(DIRSEP)hdr
-
 production: patchobj.com exeflat.exe upxentry.bin upxdevic.bin
 
 patchobj.com: patchobj.c
-	$(CLT) $(CFLAGS) patchobj.c
+	$(CLT) patchobj.c
 
 upxentry.bin: upxentry.asm
 	$(NASM) -f bin upxentry.asm -o upxentry.bin
@@ -14,7 +12,7 @@ upxdevic.bin: upxdevic.asm
 	$(NASM) -f bin upxdevic.asm -o upxdevic.bin
 
 exeflat.exe: exeflat.c ../hdr/exe.h
-	$(CLC) $(CFLAGS) exeflat.c
+	$(CLC) exeflat.c
 
 
 clobber: clean