--- Begin Message ---diff -ruNp 0old/kernel/kernel.cfg 0new/kernel/kernel.cfg --- 0old/kernel/kernel.cfg 2001-07-09 23:19:32.000000000 +0000 +++ 0new/kernel/kernel.cfg 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ --1- --f- --ff- --O --Z --d --k- --vi- --w --wpro --weas --wpre --I..\hdr --v -X- -I. -D__STDC__=0 -DTSC -DDEBUG -DKERNEL -DI86 -DPROTO -DSHWR -DASMSUPT diff -ruNp 0old/kernel/makefile 0new/kernel/makefile --- 0old/kernel/makefile 2004-01-25 22:37:20.000000000 +0000 +++ 0new/kernel/makefile 2004-04-03 12:41:04.000000000 +0000 @@ -6,36 +6,18 @@ !include "../mkfiles/generic.mak" -RELEASE = 1.00 - -# Compiler and Options - -INCLUDE=..\hdr -LIB= $(COMPILERBASE)\lib - -LIBPATH = . -#AFLAGS = /Mx /DSTANDALONE=1 /I..\HDR - -LIBS =..\lib\device.lib ..\lib\libm.lib -#INITCFLAGS =$(ALLCFLAGS) -zAINIT -zCINIT_TEXT -zDIB -zRID -zTID -zPIGROUP -zBIB \ -#-zGIGROUP -zSIGROUP -#CFLAGS =$(ALLCFLAGS) -zAHMA -zCHMA_TEXT +LIBS=..\lib\device.lib ..\lib\libm.lib HDR=../hdr/ -# *Implicit Rules* -# 'standard' compiles - -.c.obj : - $(CC) $(CFLAGS) $< - -# *List Macros* - +# *List Macros* +# only 8 files per definition; this is limitation of DOS batch +# files (only 9 directly accessible parameters). OBJS1=kernel.obj entry.obj io.obj console.obj serial.obj printer.obj dsk.obj \ sysclk.obj OBJS2=asmsupt.obj execrh.obj nlssupt.obj procsupt.obj dosidle.obj int2f.obj \ nls_hc.obj -OBJS3= apisupt.obj intr.obj irqstack.obj blockio.obj chario.obj systime.obj \ +OBJS3=apisupt.obj intr.obj irqstack.obj blockio.obj chario.obj systime.obj \ error.obj OBJS4=break.obj dosfns.obj fatdir.obj fatfs.obj fattab.obj fcbfns.obj \ inthndlr.obj @@ -43,184 +25,177 @@ OBJS5=ioctl.obj dosnames.obj memmgr.obj OBJS6=prf.obj misc.obj strings.obj syspack.obj lfnapi.obj OBJS7=main.obj config.obj initoem.obj inithma.obj dyninit.obj iprf.obj \ initdisk.obj initclk.obj -OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) +OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) $(OBJS6) $(OBJS7) # *Explicit Rules* -production: ..\bin\kernel.sys +production: ..\bin\$(TARGET).sys -..\bin\kernel.sys: kernel.sys +..\bin\$(TARGET).sys: kernel.sys copy kernel.sys ..\bin - copy kernel.sys ..\bin\$(THETARGET).sys - copy kernel.map ..\bin\$(THETARGET).map + copy kernel.sys ..\bin\$(TARGET).sys + copy kernel.map ..\bin\$(TARGET).map kernel.sys: kernel.exe ..\utils\exeflat.exe $(XUPX) kernel.exe ..\utils\exeflat kernel.exe kernel.sys 0x60 -S0x10 -S0x8B $(UPXOPT) -clobber: clean +kernel.exe: $(TARGET).lnk $(OBJS) $(LIBS) + $(LINK) @$(TARGET).lnk; + +clobber: clean -$(RM) kernel.exe kernel.sys status.me clean: - -$(RM) *.res *.obj *.bak *.crf *.xrf *.map *.lst *.cod *.err *.lnk + -$(RM) *.obj *.bak *.crf *.xrf *.map *.lst *.cod *.err *.lnk # XXX: This is a very ugly way of linking the kernel, forced upon us by the # inability of Turbo `make' 2.0 to perform command line redirection. -- ror4 ECHOTO=..\utils\echoto -kernel.res: $(OBJS) $(LIBS) - -$(RM) kernel.res - $(ECHOTO) kernel.res $(OBJS1)+ - $(ECHOTO) kernel.res $(OBJS2)+ - $(ECHOTO) kernel.res $(OBJS3)+ - $(ECHOTO) kernel.res $(OBJS4)+ - $(ECHOTO) kernel.res $(OBJS5)+ - $(ECHOTO) kernel.res $(OBJS6)+ - $(ECHOTO) kernel.res $(OBJS7) - $(ECHOTO) kernel.res kernel.exe - $(ECHOTO) kernel.res kernel.map - $(ECHOTO) kernel.res $(LIBS) - -kernel.exe: kernel.res $(OBJS) $(LIBS) - $(LINK) @kernel.res; +$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak + -$(RM) *.lnk + $(ECHOTO) $(TARGET).lnk $(OBJS1)+ + $(ECHOTO) $(TARGET).lnk $(OBJS2)+ + $(ECHOTO) $(TARGET).lnk $(OBJS3)+ + $(ECHOTO) $(TARGET).lnk $(OBJS4)+ + $(ECHOTO) $(TARGET).lnk $(OBJS5)+ + $(ECHOTO) $(TARGET).lnk $(OBJS6)+ + $(ECHOTO) $(TARGET).lnk $(OBJS7) + $(ECHOTO) $(TARGET).lnk kernel.exe + $(ECHOTO) $(TARGET).lnk kernel.map + $(ECHOTO) $(TARGET).lnk $(LIBS) # *Individual File Dependencies* -kernel.obj: kernel.asm segs.inc ludivmul.inc - -console.obj: console.asm io.inc -printer.obj: printer.asm io.inc +kernel.obj: kernel.asm segs.inc ludivmul.inc $(TARGET).lnk -serial.obj: serial.asm io.inc +console.obj: console.asm io.inc $(TARGET).lnk -entry.obj: entry.asm segs.inc $(HDR)stacks.inc +printer.obj: printer.asm io.inc $(TARGET).lnk -apisupt.obj: apisupt.asm segs.inc +serial.obj: serial.asm io.inc $(TARGET).lnk -execrh.obj: execrh.asm segs.inc +entry.obj: entry.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk -int2f.obj: int2f.asm segs.inc +apisupt.obj: apisupt.asm segs.inc $(TARGET).lnk -intr.obj: intr.asm segs.inc +execrh.obj: execrh.asm segs.inc $(TARGET).lnk -io.obj: io.asm segs.inc +int2f.obj: int2f.asm segs.inc $(TARGET).lnk -irqstack.obj: irqstack.asm +intr.obj: intr.asm segs.inc $(TARGET).lnk -nls_hc.obj: nls_hc.asm segs.inc +io.obj: io.asm segs.inc $(TARGET).lnk -nlssupt.obj: nlssupt.asm segs.inc +irqstack.obj: irqstack.asm $(TARGET).lnk -procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc +nls_hc.obj: nls_hc.asm segs.inc $(TARGET).lnk -dosidle.obj: dosidle.asm segs.inc - -# XXX: Special handling for initialization modules -- this is required because -# TC 2.01 cannot handle `#pragma option' like TC 3 can. -- ror4 +nlssupt.obj: nlssupt.asm segs.inc $(TARGET).lnk -INITHEADERS=init-mod.h init-dat.h +procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk -CONFIGURATION = turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).MAK +dosidle.obj: dosidle.asm segs.inc $(TARGET).lnk -HEADERS=\ - $(HDR)portab.h $(HDR)device.h $(HDR)mcb.h $(HDR)pcb.h \ - $(HDR)fat.h $(HDR)fcb.h $(HDR)tail.h $(HDR)time.h $(HDR)process.h \ - $(HDR)dcb.h $(HDR)sft.h $(HDR)cds.h $(HDR)exe.h $(HDR)fnode.h \ - $(HDR)dirmatch.h $(HDR)file.h $(HDR)clock.h $(HDR)kbd.h $(HDR)error.h \ - $(HDR)version.h globals.h proto.h dyndata.h +INITHEADERS=init-mod.h init-dat.h -# XXX: I generated these using `gcc -MM' and `sed', so they may not be -# completely correct... -- ror4 +HEADERS=$(HDR)portab.h $(HDR)device.h $(HDR)mcb.h $(HDR)pcb.h \ +$(HDR)fat.h $(HDR)fcb.h $(HDR)tail.h $(HDR)time.h $(HDR)process.h \ +$(HDR)dcb.h $(HDR)sft.h $(HDR)cds.h $(HDR)exe.h $(HDR)fnode.h \ +$(HDR)dirmatch.h $(HDR)file.h $(HDR)clock.h $(HDR)kbd.h $(HDR)error.h \ +$(HDR)version.h globals.h proto.h dyndata.h -blockio.obj: blockio.c $(HEADERS) $(CONFIGURATION) +blockio.obj: blockio.c $(HEADERS) $(TARGET).lnk -break.obj: break.c $(HEADERS) $(CONFIGURATION) +break.obj: break.c $(HEADERS) $(TARGET).lnk -chario.obj: chario.c $(HEADERS) $(CONFIGURATION) +chario.obj: chario.c $(HEADERS) $(TARGET).lnk -dosfns.obj: dosfns.c $(HEADERS) $(CONFIGURATION) +dosfns.obj: dosfns.c $(HEADERS) $(TARGET).lnk -dosnames.obj: dosnames.c $(HEADERS) $(CONFIGURATION) +dosnames.obj: dosnames.c $(HEADERS) $(TARGET).lnk -dsk.obj: dsk.c $(HEADERS) $(CONFIGURATION) +dsk.obj: dsk.c $(HEADERS) $(TARGET).lnk -error.obj: error.c $(HEADERS) $(CONFIGURATION) +error.obj: error.c $(HEADERS) $(TARGET).lnk -fatdir.obj: fatdir.c $(HEADERS) $(CONFIGURATION) +fatdir.obj: fatdir.c $(HEADERS) $(TARGET).lnk -fatfs.obj: fatfs.c $(HEADERS) $(CONFIGURATION) +fatfs.obj: fatfs.c $(HEADERS) $(TARGET).lnk -fattab.obj: fattab.c $(HEADERS) $(CONFIGURATION) +fattab.obj: fattab.c $(HEADERS) $(TARGET).lnk -fcbfns.obj: fcbfns.c $(HEADERS) $(CONFIGURATION) +fcbfns.obj: fcbfns.c $(HEADERS) $(TARGET).lnk -inthndlr.obj: inthndlr.c $(HEADERS) $(CONFIGURATION) +inthndlr.obj: inthndlr.c $(HEADERS) $(TARGET).lnk -ioctl.obj: ioctl.c $(HEADERS) $(CONFIGURATION) +ioctl.obj: ioctl.c $(HEADERS) $(TARGET).lnk -memmgr.obj: memmgr.c $(HEADERS) $(CONFIGURATION) +memmgr.obj: memmgr.c $(HEADERS) $(TARGET).lnk -misc.obj: misc.c $(HEADERS) $(CONFIGURATION) +misc.obj: misc.c $(HEADERS) $(TARGET).lnk -lfnapi.obj: lfnapi.c $(HEADERS) $(CONFIGURATION) +lfnapi.obj: lfnapi.c $(HEADERS) $(TARGET).lnk -newstuff.obj: newstuff.c $(HEADERS) $(CONFIGURATION) +newstuff.obj: newstuff.c $(HEADERS) $(TARGET).lnk -network.obj: network.c $(HEADERS) $(CONFIGURATION) +network.obj: network.c $(HEADERS) $(TARGET).lnk -nls.obj: nls.c $(HEADERS) $(CONFIGURATION) +nls.obj: nls.c $(HEADERS) $(TARGET).lnk # \ # 001-437.nls -prf.obj: prf.c $(HDR)portab.h $(CONFIGURATION) +prf.obj: prf.c $(HDR)portab.h $(TARGET).lnk -strings.obj: strings.c $(CONFIGURATION) +strings.obj: strings.c $(TARGET).lnk -sysclk.obj: sysclk.c $(HEADERS) $(CONFIGURATION) +sysclk.obj: sysclk.c $(HEADERS) $(TARGET).lnk -syspack.obj: syspack.c $(HEADERS) $(CONFIGURATION) +syspack.obj: syspack.c $(HEADERS) $(TARGET).lnk -systime.obj: systime.c $(HEADERS) $(CONFIGURATION) +systime.obj: systime.c $(HEADERS) $(TARGET).lnk -task.obj: task.c $(HEADERS) $(CONFIGURATION) +task.obj: task.c $(HEADERS) $(TARGET).lnk # now the funny stuff :-) # Files in the INIT segment -# $(CC) $(INITCFLAGS) -c $*.c -# patchobj $*.obj $(INITPATCH) +# XXX: Special handling for initialization modules -- this is required because +# TC 2.01 cannot handle `#pragma option' like TC 3 can. -- ror4 -config.obj: config.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initoem.obj: initoem.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -main.obj: main.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -inithma.obj: inithma.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -dyninit.obj: dyninit.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initdisk.obj: initdisk.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initclk.obj: initclk.c $(INITHEADERS) $(HEADERS) $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj +config.obj: config.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initoem.obj: initoem.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +main.obj: main.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +inithma.obj: inithma.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +dyninit.obj: dyninit.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initdisk.obj: initdisk.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initclk.obj: initclk.c $(INITHEADERS) $(HEADERS) $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj #the printf for INIT_TEXT - yet another special case, this file includes prf.c -iprf.obj: iprf.c prf.c $(HDR)portab.h $(CONFIGURATION) - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj + +iprf.obj: iprf.c prf.c $(HDR)portab.h $(TARGET).lnk + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj diff -ruNp 0old/kernel/turboc.cfg 0new/kernel/turboc.cfg --- 0old/kernel/turboc.cfg 2003-09-09 18:25:24.000000000 +0000 +++ 0new/kernel/turboc.cfg 2004-03-09 23:54:30.000000000 +0000 @@ -1,15 +1,10 @@ --f- --ff- --O --Z -d +-f- -k- +-O -Z +-p +-v- -vi- --wpro --weas --wpre --w --g1 +-w -g1 -I..\hdr --p --v- -I. -D__STDC__=0 -DKERNEL -DI86 -DPROTO -DASMSUPT +-DKERNEL;I86;PROTO;ASMSUPT diff -ruNp 0old/mkfiles/bc5.mak 0new/mkfiles/bc5.mak --- 0old/mkfiles/bc5.mak 2003-06-15 12:50:06.000000000 +0000 +++ 0new/mkfiles/bc5.mak 2004-03-27 09:54:58.000000000 +0000 @@ -4,15 +4,8 @@ # Use these for Borland C++ -COMPILERPATH=$(BC5_BASE) -COMPILERBIN=$(COMPILERPATH)\bin -CC=$(COMPILERBIN)\bcc -c -CL=$(COMPILERBIN)\bcc -INCLUDEPATH=$(COMPILERPATH)\include -LIBUTIL=$(COMPILERBIN)\tlib -LIBPATH=$(COMPILERPATH)\lib -LIBTERM= -LIBPLUS=+ +CC=$(BINPATH)\bcc -c +CL=$(BINPATH)\bcc TINY=-lt CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d @@ -22,9 +15,9 @@ TARGET=KBC # used for building the library -CLIB=$(COMPILERPATH)\lib\cs.lib +CLIB=$(LIBPATH)\cs.lib MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL -MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL +MATH_INSERT =+H_LDIV +H_LLSH +H_LURSH +F_LXMUL # # heavy stuff - building the kernel diff -ruNp 0old/mkfiles/generic.mak 0new/mkfiles/generic.mak --- 0old/mkfiles/generic.mak 2004-01-25 22:20:34.000000000 +0000 +++ 0new/mkfiles/generic.mak 2004-04-03 11:09:42.000000000 +0000 @@ -5,43 +5,52 @@ #* TARGETOPT : options, handled down to the compiler #********************************************************************** -TARGETOPT=-1- +!ifndef XFAT +XFAT=32 +!endif +!if $(XFAT) == 32 +ALLCFLAGS=$(ALLCFLAGS) -DWITHFAT32 +NASMFLAGS=$(NASMFLAGS) -DWITHFAT32 +!endif + +NASMFLAGS=$(NASMFLAGS) -i../hdr/ +TARGETOPT=-1- +!ifndef XCPU +XCPU=86 +!endif !if $(XCPU) == 186 TARGETOPT=-1 !endif !if $(XCPU) == 386 TARGETOPT=-3 +NASMFLAGS=$(NASMFLAGS) -DI386 !endif -!if $(XFAT) == 32 -ALLCFLAGS=$(ALLCFLAGS) -DWITHFAT32 -NASMFLAGS=$(NASMFLAGS) -DWITHFAT32 -!endif - -NASM=$(XNASM) -!if $(XCPU) == 386 -NASMFLAGS = $(NASMFLAGS) -i../hdr/ -DI386 +!ifndef XUPX [EMAIL PROTECTED] +UPXOPT= !else -NASMFLAGS = $(NASMFLAGS) -i../hdr/ +UPXOPT=-U !endif - -LINK=$(XLINK) - [EMAIL PROTECTED] +BINPATH=$(BASE)\bin +INCLUDEPATH=$(BASE)\include +LIBPATH=$(BASE)\lib + !include "..\mkfiles\$(COMPILER).mak" -THETARGET=$(TARGET)$(XCPU)$(XFAT) +TARGET=$(TARGET)$(XCPU)$(XFAT) RM=..\utils\rmfiles -.asm.obj : - $(NASM) -D$(COMPILER) $(NASMFLAGS) -f obj $*.asm - # *Implicit Rules* -.c.obj : - $(CC) $(CFLAGS) $*.c -.cpp.obj : - $(CC) $(CFLAGS) $*.cpp +.asm.obj: + $(NASM) -D$(COMPILER) $(NASMFLAGS) -f obj $< + +.c.obj: + $(CC) $(CFLAGS) $< +.cpp.obj: + $(CC) $(CFLAGS) $< diff -ruNp 0old/mkfiles/mscl8.mak 0new/mkfiles/mscl8.mak --- 0old/mkfiles/mscl8.mak 2003-08-28 21:37:20.000000000 +0000 +++ 0new/mkfiles/mscl8.mak 2004-03-27 09:55:04.000000000 +0000 @@ -3,31 +3,19 @@ # # Use these for MSCV 1.52 -COMPILERPATH=$(MS_BASE) -COMPILERBIN=$(COMPILERPATH)\bin -INCLUDEPATH=$(COMPILERPATH)\include -CC=$(COMPILERBIN)\cl -c -CL=$(COMPILERBIN)\cl + +CC=$(BINPATH)\cl -c +CL=$(BINPATH)\cl + +INCLUDE=$(BASE)\include +LIB=$(BASE)\lib + TINY= CFLAGST=/Fm /AT /Os /Zp1 CFLAGSC=/Fm /AL /Os /Zp1 -LIBPATH=$(COMPILERPATH)\lib -LIB=$(COMPILERPATH)\lib -INCLUDE=$(COMPILERPATH)\include -LIBUTIL=$(COMPILERBIN)\lib /nologo -LIBPLUS=+ -LIBTERM=; -INCLUDE=$(COMPILERPATH)\include -LIB=$(COMPILERPATH)\lib - -# used for building the library - -CLIB=$(COMPILERPATH)\lib\slibce.lib -MATH_EXTRACT=*aflmul *aFlshl *aFNauldi *aFulrem *aFulshr *aFuldiv *aFlrem *aFldiv -MATH_INSERT= +aflmul +aFlshl +aFNauldi +aFulrem +aFulshr +aFuldiv +aFlrem +aFldiv TARGETOPT= -!if $(XCPU) == 186 +!if $(XCPU) == 186 TARGETOPT=-G1 !endif !if $(XCPU) == 386 @@ -36,12 +24,16 @@ TARGETOPT=-G3 TARGET=KMS +# used for building the library + +CLIB=$(LIBPATH)\slibce.lib +MATH_EXTRACT=*aflmul *aFlshl *aFNauldi *aFulrem *aFulshr *aFuldiv *aFlrem *aFldiv +MATH_INSERT =+aflmul +aFlshl +aFNauldi +aFulrem +aFulshr +aFuldiv +aFlrem +aFldiv + # # heavy stuff - building - ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS) -nologo -Zl -Fc -WX -Gr -f- -Os -Gs -Ob1 -OV4 -Gy -Oe -Zp1 - INITCFLAGS=$(ALLCFLAGS) -NTINIT_TEXT -AT CFLAGS=$(ALLCFLAGS) -NTHMA_TEXT -INITPATCH = ..\utils\patchobj _DATA=IDATA DATA=ID BSS=ID DGROUP=I_GROUP CONST=IC +INITPATCH=..\utils\patchobj _DATA=IDATA DATA=ID BSS=ID DGROUP=I_GROUP CONST=IC diff -ruNp 0old/mkfiles/tc2.mak 0new/mkfiles/tc2.mak --- 0old/mkfiles/tc2.mak 2003-09-18 22:43:02.000000000 +0000 +++ 0new/mkfiles/tc2.mak 2004-03-27 09:55:18.000000000 +0000 @@ -1,18 +1,12 @@ # -# TURBOC.MAK - kernel copiler options for TURBOC +# TC2.MAK - kernel copiler options for Turbo C # # Use these for Turbo C 2.01 -COMPILERPATH=$(TC2_BASE) -COMPILERBIN=$(COMPILERPATH) -CC=$(COMPILERBIN)\tcc -c -CL=$(COMPILERBIN)\tcc -INCLUDEPATH=$(COMPILERPATH)\include -LIBUTIL=$(COMPILERBIN)\tlib -LIBPATH=$(COMPILERPATH)\lib -LIBTERM= -LIBPLUS=+ +BINPATH=$(BASE) +CC=$(BINPATH)\tcc -c +CL=$(BINPATH)\tcc TINY=-lt CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d @@ -22,9 +16,9 @@ TARGET=KTC # used for building the library -CLIB=$(COMPILERPATH)\lib\cs.lib +CLIB=$(LIBPATH)\cs.lib MATH_EXTRACT=*LDIV *LXMUL *LURSH *LLSH *LRSH -MATH_INSERT=+LDIV +LXMUL +LURSH +LLSH +LRSH +MATH_INSERT =+LDIV +LXMUL +LURSH +LLSH +LRSH # # heavy stuff - building the kernel diff -ruNp 0old/mkfiles/tc3.mak 0new/mkfiles/tc3.mak --- 0old/mkfiles/tc3.mak 2003-06-15 12:52:14.000000000 +0000 +++ 0new/mkfiles/tc3.mak 2004-03-27 09:55:24.000000000 +0000 @@ -4,15 +4,8 @@ # Use these for Turbo C 3.0 -COMPILERPATH=$(TC3_BASE) -COMPILERBIN=$(COMPILERPATH)\bin -CC=$(COMPILERBIN)\tcc -c -CL=$(COMPILERBIN)\tcc -INCLUDEPATH=$(COMPILERPATH)\include -LIBUTIL=$(COMPILERBIN)\tlib -LIBPATH=$(COMPILERPATH)\lib -LIBTERM= -LIBPLUS=+ +CC=$(BINPATH)\tcc -c +CL=$(BINPATH)\tcc TINY=-lt CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d @@ -22,9 +15,9 @@ TARGET=KT3 # used for building the library -CLIB=$(COMPILERPATH)\lib\cs.lib +CLIB=$(LIBPATH)\cs.lib MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL -MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL +MATH_INSERT =+H_LDIV +H_LLSH +H_LURSH +F_LXMUL # # heavy stuff - building the kernel diff -ruNp 0old/mkfiles/turbocpp.mak 0new/mkfiles/turbocpp.mak --- 0old/mkfiles/turbocpp.mak 2003-06-15 13:33:50.000000000 +0000 +++ 0new/mkfiles/turbocpp.mak 2004-03-27 09:55:28.000000000 +0000 @@ -4,15 +4,8 @@ # Use these for Turbo CPP 1.01 -COMPILERPATH=$(TP1_BASE) -COMPILERBIN=$(COMPILERPATH)\bin -CC=$(COMPILERBIN)\tcc -c -CL=$(COMPILERBIN)\tcc -INCLUDEPATH=$(COMPILERPATH)\include -LIBUTIL=$(COMPILERBIN)\tlib -LIBPATH=$(COMPILERPATH)\lib -LIBTERM= -LIBPLUS=+ +CC=$(BINPATH)\tcc -c +CL=$(BINPATH)\tcc TINY=-lt CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d @@ -22,9 +15,9 @@ TARGET=KTP # used for building the library -CLIB=$(COMPILERPATH)\lib\cs.lib +CLIB=$(LIBPATH)\cs.lib MATH_EXTRACT=*H_LDIV *H_LLSH *H_LURSH *F_LXMUL -MATH_INSERT=+H_LDIV +H_LLSH +H_LURSH +F_LXMUL +MATH_INSERT =+H_LDIV +H_LLSH +H_LURSH +F_LXMUL # # heavy stuff - building the kernel diff -ruNp 0old/mkfiles/watcom.mak 0new/mkfiles/watcom.mak --- 0old/mkfiles/watcom.mak 2003-09-18 22:43:02.000000000 +0000 +++ 0new/mkfiles/watcom.mak 2004-04-03 12:08:58.000000000 +0000 @@ -3,23 +3,15 @@ # # Use these for WATCOM 11.0c -COMPILERPATH=$(WATCOM) + CC=*wcc CL=wcl -INCLUDEPATH=$(COMPILERPATH)\H -INCLUDE=$(COMPILERPATH)\h -EDPATH=$(COMPILERPATH)\EDDAT +INCLUDEPATH=$(BASE)\H +LIBPATH=$(BASE)\lib286 -!if $(XCPU) != 186 -!if $(XCPU) != 386 +!if $(XCPU) < 186 TARGETOPT=-0 !endif -!endif - -LIBPATH=$(COMPILERPATH)\lib286 -LIBUTIL=wlib -q -LIBPLUS= -LIBTERM= TINY=-mt CFLAGST=-zq-zp1-os-s-we-e3-wx @@ -29,40 +21,34 @@ TARGET=KWC # used for building the library -CLIB=$(COMPILERPATH)\lib286\dos\clibm.lib - -# we use our own ones, which override these ones when linking. -# - +CLIB=$(LIBPATH)\dos\clibm.lib MATH_EXTRACT=*i4m -MATH_INSERT=+i4m - +MATH_INSERT =+i4m # -# heavy stuff - building +# heavy stuff - building # # -e=<num> set limit on number of error messages # -ms small memory model (small code/small data) -# -j change char default from unsigned to signed -#-nc=<id> set code class name -#-nd=<id> set data segment name -#-nm=<file> set module name -#-nt=<id> set name of text segment +# -j change char default from unsigned to signed +# -nc=<id> set code class name +# -nd=<id> set data segment name +# -nm=<file> set module name +# -nt=<id> set name of text segment # -g=<id> set code group name # -os -> favor code size over execution time in optimizations -# -s remove stack overflow checks -# -w=<num> set warning level number -# -we treat all warnings as errors +# -s remove stack overflow checks +# -w=<num> set warning level number +# -we treat all warnings as errors # -ze enable extensions (i.e., near, far, export, etc.) # -zl remove default library information # -zp=<num> pack structure members with alignment {1,2,4,8,16} # -zq operate quietly # -# -3 optimization for 386 - given in CONFIG.MAK, not here +# -3 optimization for 386 - given in GENERIC.MAK, not here # -ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff +ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-d1 INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-ndI CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT INITPATCH=..\utils\patchobj __U4D=_IU4D __U4M=_IU4M - diff -ruNp 0old/utils/indent.ini 0new/utils/indent.ini --- 0old/utils/indent.ini 2001-11-18 18:18:12.000000000 +0000 +++ 0new/utils/indent.ini 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ --kr --di2 --nbc --nfca --bl --bli0 --ss --npcs --ncs --nbs --i2 --ci4 --nce --sob --nut --nbad --cli2 --hnl diff -ruNp 0old/utils/makefile 0new/utils/makefile --- 0old/utils/makefile 2003-09-14 17:28:28.000000000 +0000 +++ 0new/utils/makefile 2004-04-03 10:23:32.000000000 +0000 @@ -1,6 +1,6 @@ !include "../mkfiles/generic.mak" -CFLAGS = -I$(INCLUDEPATH) -I..\hdr +CFLAGS=-I$(INCLUDEPATH) -I..\hdr production: patchobj.com exeflat.exe @@ -14,6 +14,5 @@ exeflat.exe: exeflat.c ../hdr/exe.h clobber: clean clean: - $(RM) *.obj *.bak *.crf *.xrf *.map *.lst *.las *.cod *.err status.me - $(RM) exeflat.exe patchobj.com - + $(RM) *.obj *.bak *.crf *.xrf *.map *.lst *.las *.cod *.err \ + status.me exeflat.exe patchobj.com diff -ruNp 0old/utils/proto.bat 0new/utils/proto.bat --- 0old/utils/proto.bat 2001-11-17 23:26:44.000000000 +0000 +++ 0new/utils/proto.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -for %%f in ( %1 %2 %3 %4 %5 %6 %7 %8 %9 ) do mkptypes %%f >>proto.h - diff -ruNp 0old/utils/rmfiles.bat 0new/utils/rmfiles.bat --- 0old/utils/rmfiles.bat 2002-01-23 22:29:40.000000000 +0000 +++ 0new/utils/rmfiles.bat 2004-03-27 06:10:04.000000000 +0000 @@ -2,9 +2,8 @@ :loop_commandline if \%1 == \ goto done_with_commandline -if exist %1 del %1 +if exist %1 del %1>nul shift goto loop_commandline :done_with_commandline - diff -ruNp 0old/utils/wlinker.bat 0new/utils/wlinker.bat --- 0old/utils/wlinker.bat 2003-09-14 20:53:56.000000000 +0000 +++ 0new/utils/wlinker.bat 2004-04-03 11:38:24.000000000 +0000 @@ -1,4 +1,4 @@ @echo off -ms2wlink %1 %2 %3 %4 %5 %6 %7 %8 %9 ,,,, > kernel.lnk -echo op map,statics,verbose >> kernel.lnk -wlink < kernel.lnk +ms2wlink %1 %2 %3 %4 %5 %6 %7 %8 %9 ,,,,>kernel.lnk +echo op map,statics,verbose>>kernel.lnk +call wlink @kernel.lnk------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Freedos-kernel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freedos-kernel
--- End Message ---
