--- Begin Message ---diff -ruNp old/kernel/kernel.cfg new/kernel/kernel.cfg --- old/kernel/kernel.cfg 2001-07-10 00:19:32.000000000 +0000 +++ new/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 old/kernel/makefile new/kernel/makefile --- old/kernel/makefile 2004-04-12 11:36:06.000000000 +0000 +++ new/kernel/makefile 2004-04-22 11:30:48.000000000 +0000 @@ -29,7 +29,7 @@ OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) # *Explicit Rules* -production: ..\bin\$(TARGET).sys +production: ..\bin\$(TARGET).sys ..\bin\$(TARGET).sys: kernel.sys copy kernel.sys ..\bin @@ -43,7 +43,7 @@ kernel.sys: kernel.exe ..\utils\exeflat. kernel.exe: $(TARGET).lnk $(OBJS) $(LIBS) $(LINK) @$(TARGET).lnk; -clobber: clean +clobber: clean -$(RM) kernel.exe kernel.sys status.me clean: @@ -54,8 +54,8 @@ clean: ECHOTO=..\utils\echoto -$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak - -$(RM) *.lnk +$(TARGET).lnk: turboc.cfg makefile ..\mkfiles\generic.mak ..\mkfiles\$(COMPILER).mak + -$(RM) *.lnk *.obj $(ECHOTO) $(TARGET).lnk $(OBJS1)+ $(ECHOTO) $(TARGET).lnk $(OBJS2)+ $(ECHOTO) $(TARGET).lnk $(OBJS3)+ @@ -68,57 +68,52 @@ $(TARGET).lnk: turboc.cfg makefile ..\mk $(ECHOTO) $(TARGET).lnk $(LIBS) # *Individual File Dependencies* -apisupt.obj: apisupt.asm segs.inc $(TARGET).lnk -asmsupt.obj: asmsupt.asm segs.inc $(TARGET).lnk -console.obj: console.asm io.inc $(TARGET).lnk -dosidle.obj: dosidle.asm segs.inc $(TARGET).lnk -entry.obj: entry.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk -execrh.obj: execrh.asm segs.inc $(TARGET).lnk -int2f.obj: int2f.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk -intr.obj: intr.asm segs.inc $(TARGET).lnk -io.obj: io.asm segs.inc $(TARGET).lnk -irqstack.obj: irqstack.asm segs.inc $(TARGET).lnk -kernel.obj: kernel.asm segs.inc ludivmul.inc $(TARGET).lnk -nls_hc.obj: nls_hc.asm segs.inc $(TARGET).lnk -nlssupt.obj: nlssupt.asm segs.inc $(TARGET).lnk -printer.obj: printer.asm io.inc $(TARGET).lnk -procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc $(TARGET).lnk -serial.obj: serial.asm io.inc $(TARGET).lnk - -HDRS=\ - $(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 dyndata.h -HEADERS=$(HDRS) globals.h proto.h -INITHEADERS=$(HDRS) init-mod.h init-dat.h - -blockio.obj: blockio.c $(HEADERS) $(TARGET).lnk -break.obj: break.c $(HEADERS) $(TARGET).lnk -chario.obj: chario.c $(HEADERS) $(TARGET).lnk -dosfns.obj: dosfns.c $(HEADERS) $(TARGET).lnk -dosnames.obj: dosnames.c $(HEADERS) $(TARGET).lnk -dsk.obj: dsk.c $(HEADERS) $(TARGET).lnk -error.obj: error.c $(HEADERS) $(TARGET).lnk -fatdir.obj: fatdir.c $(HEADERS) $(TARGET).lnk -fatfs.obj: fatfs.c $(HEADERS) $(TARGET).lnk -fattab.obj: fattab.c $(HEADERS) $(TARGET).lnk -fcbfns.obj: fcbfns.c $(HEADERS) $(TARGET).lnk -inthndlr.obj: inthndlr.c $(HEADERS) $(TARGET).lnk -ioctl.obj: ioctl.c $(HEADERS) $(TARGET).lnk -memmgr.obj: memmgr.c $(HEADERS) $(TARGET).lnk -misc.obj: misc.c $(HEADERS) $(TARGET).lnk -lfnapi.obj: lfnapi.c $(HEADERS) $(TARGET).lnk -newstuff.obj: newstuff.c $(HEADERS) $(TARGET).lnk -network.obj: network.c $(HEADERS) $(TARGET).lnk -nls.obj: nls.c $(HEADERS) $(TARGET).lnk -prf.obj: prf.c $(HDR)portab.h $(TARGET).lnk -strings.obj: strings.c $(TARGET).lnk -sysclk.obj: sysclk.c $(HEADERS) $(TARGET).lnk -syspack.obj: syspack.c $(HEADERS) $(TARGET).lnk -systime.obj: systime.c $(HEADERS) $(TARGET).lnk -task.obj: task.c $(HEADERS) $(TARGET).lnk + +apisupt.obj: apisupt.asm segs.inc +asmsupt.obj: asmsupt.asm segs.inc +console.obj: console.asm io.inc +dosidle.obj: dosidle.asm segs.inc +entry.obj: entry.asm segs.inc $(HDR)stacks.inc +execrh.obj: execrh.asm segs.inc +int2f.obj: int2f.asm segs.inc $(HDR)stacks.inc +intr.obj: intr.asm segs.inc +io.obj: io.asm segs.inc +irqstack.obj: irqstack.asm segs.inc +kernel.obj: kernel.asm segs.inc ludivmul.inc +nls_hc.obj: nls_hc.asm segs.inc +nlssupt.obj: nlssupt.asm segs.inc +printer.obj: printer.asm io.inc +procsupt.obj: procsupt.asm segs.inc $(HDR)stacks.inc +serial.obj: serial.asm io.inc + +HEADERS=$(HDR)*.h dyndata.h globals.h proto.h +INITHEADERS=$(HDR)*.h dyndata.h init-mod.h init-dat.h + +blockio.obj: blockio.c $(HEADERS) +break.obj: break.c $(HEADERS) +chario.obj: chario.c $(HEADERS) +dosfns.obj: dosfns.c $(HEADERS) +dosnames.obj: dosnames.c $(HEADERS) +dsk.obj: dsk.c $(HEADERS) +error.obj: error.c $(HEADERS) +fatdir.obj: fatdir.c $(HEADERS) +fatfs.obj: fatfs.c $(HEADERS) +fattab.obj: fattab.c $(HEADERS) +fcbfns.obj: fcbfns.c $(HEADERS) +inthndlr.obj: inthndlr.c $(HEADERS) +ioctl.obj: ioctl.c $(HEADERS) +lfnapi.obj: lfnapi.c $(HEADERS) +memmgr.obj: memmgr.c $(HEADERS) +misc.obj: misc.c $(HEADERS) +network.obj: network.c $(HEADERS) +newstuff.obj: newstuff.c $(HEADERS) +nls.obj: nls.c $(HEADERS) +prf.obj: prf.c $(HDR)portab.h +strings.obj: strings.c +sysclk.obj: sysclk.c $(HEADERS) +syspack.obj: syspack.c $(HEADERS) +systime.obj: systime.c $(HEADERS) +task.obj: task.c $(HEADERS) # now the funny stuff :-) # Files in the INIT segment @@ -126,39 +121,41 @@ task.obj: task.c $(HEADERS) $(TAR # 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) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initoem.obj: initoem.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -main.obj: main.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -inithma.obj: inithma.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -dyninit.obj: dyninit.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initdisk.obj: initdisk.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj - -initclk.obj: initclk.c $(INITHEADERS) $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj +config.obj: config.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +dyninit.obj: dyninit.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initclk.obj: initclk.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initdisk.obj: initdisk.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +inithma.obj: inithma.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +initoem.obj: initoem.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj + +main.obj: main.c $(INITHEADERS) + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj #the string functions for INIT_TEXT -iasmsupt.obj: asmsupt.asm $(TARGET).lnk - $(NASM) -D$(COMPILER) -D_INIT $(NASMFLAGS) -f obj -o iasmsupt.obj asmsupt.asm + +iasmsupt.obj: asmsupt.asm + $(NASM) -D$(COMPILER) -D_INIT $(NASMFLAGS) -f obj -o iasmsupt.obj asmsupt.asm #the printf for INIT_TEXT - yet another special case, this file includes prf.c -iprf.obj: iprf.c prf.c $(HDR)portab.h $(TARGET).lnk - $(CC) $(INITCFLAGS) $*.c - $(INITPATCH) $*.obj + +iprf.obj: iprf.c prf.c $(HDR)portab.h + $(CC) $(INITCFLAGS) $*.c + $(INITPATCH) $*.obj diff -ruNp old/kernel/nls_load.c new/kernel/nls_load.c --- old/kernel/nls_load.c 2003-06-28 00:02:56.000000000 +0000 +++ new/kernel/nls_load.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/****************************************************************/ -/* */ -/* nls_load.c */ -/* FreeDOS */ -/* */ -/* National Languge Support functions and data structures */ -/* Load an entry from FreeDOS COUNTRY.SYS file. */ -/* */ -/* Copyright (c) 2000 */ -/* Steffen Kaiser */ -/* All Rights Reserved */ -/* */ -/* This file is part of FreeDOS. */ -/* */ -/* DOS-C is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU General Public License */ -/* as published by the Free Software Foundation; either version */ -/* 2, or (at your option) any later version. */ -/* */ -/* DOS-C is distributed in the hope that it will be useful, but */ -/* WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public */ -/* License along with DOS-C; see the file COPYING. If not, */ -/* write to the Free Software Foundation, 675 Mass Ave, */ -/* Cambridge, MA 02139, USA. */ -/****************************************************************/ - -#include "portab.h" -#include "init-mod.h" - -#ifdef VERSION_STRINGS -static BYTE *RcsId = - "$Id: nls_load.c,v 1.8 2003/06/27 22:02:57 bartoldeman Exp $"; -#endif - -/** Setup the environment for shared source NLS_LOAD.SRC **/ -/**ska obsoleted #define cfgMemory Config.cfgCSYS_memory */ -/**ska obsoleted #define cfgFilename Config.cfgCSYS_fnam */ -#define cfgFilename nlsInfo.fname /* char FAR * */ -/**ska obsoleted #define cfgCountry Config.cfgCSYS_cntry */ -/**ska obsoleted #define cfgCodepage Config.cfgCSYS_cp */ -#define cfgData Config.cfgCSYS_data /* struct nlsCSys_loadPackage FAR * */ -#define getMem(bytes) KernelAlloc(bytes) -#define openSYSFile(filename) open(filename, 0) /* read-only, binary */ -#define nlsStartOfChain nlsInfo.chain -#define upCaseFct CharMapSrvc - -#include "nls_load.src" diff -ruNp old/kernel/turboc.cfg new/kernel/turboc.cfg --- old/kernel/turboc.cfg 2003-09-09 19:25:24.000000000 +0000 +++ new/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 old/mkfiles/bc5.mak new/mkfiles/bc5.mak --- old/mkfiles/bc5.mak 2003-06-15 13:50:06.000000000 +0000 +++ new/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 old/mkfiles/generic.mak new/mkfiles/generic.mak --- old/mkfiles/generic.mak 2004-04-13 21:27:18.000000000 +0000 +++ new/mkfiles/generic.mak 2004-04-24 05:01:56.000000000 +0000 @@ -5,8 +5,14 @@ #* TARGETOPT : options, handled down to the compiler #********************************************************************** -TARGETOPT=-1- +!if $(XFAT)+0 == 0 +XFAT=32 +!endif +!if $(XCPU)+0 == 0 +XCPU=86 +!endif +TARGETOPT=-1- !if $(XCPU) == 186 TARGETOPT=-1 !endif @@ -19,25 +25,45 @@ ALLCFLAGS=$(ALLCFLAGS) -DWITHFAT32 NASMFLAGS=$(NASMFLAGS) -DWITHFAT32 !endif -NASM=$(XNASM) -NASMFLAGS = $(NASMFLAGS) -i../hdr/ -DXCPU=$(XCPU) +NASMFLAGS=$(NASMFLAGS) -i../hdr/ -DXCPU=$(XCPU) + +!if $(__VERSION__) # WMAKE? + +!if "$(XUPX)" == "" [EMAIL PROTECTED] +UPXOPT= +!else +UPXOPT=-U +!endif -LINK=$(XLINK) +!else # TC/BC MAKE +!if !$d(XUPX) [EMAIL PROTECTED] +UPXOPT= +!else +UPXOPT=-U +!endif + +!endif [EMAIL PROTECTED] +BINPATH=$(BASE)\bin +INCLUDEPATH=$(BASE)\include +LIBPATH=$(BASE)\lib + !include "..\mkfiles\$(COMPILER).mak" 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 old/mkfiles/mscl8.mak new/mkfiles/mscl8.mak --- old/mkfiles/mscl8.mak 2004-04-11 14:38:50.000000000 +0000 +++ new/mkfiles/mscl8.mak 2004-04-22 08:14:58.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 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 old/mkfiles/tc2.mak new/mkfiles/tc2.mak --- old/mkfiles/tc2.mak 2003-09-18 23:43:02.000000000 +0000 +++ new/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 old/mkfiles/tc3.mak new/mkfiles/tc3.mak --- old/mkfiles/tc3.mak 2003-06-15 13:52:14.000000000 +0000 +++ new/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 old/mkfiles/turbocpp.mak new/mkfiles/turbocpp.mak --- old/mkfiles/turbocpp.mak 2003-06-15 14:33:50.000000000 +0000 +++ new/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 old/mkfiles/watcom.mak new/mkfiles/watcom.mak --- old/mkfiles/watcom.mak 2004-04-10 15:51:10.000000000 +0000 +++ new/mkfiles/watcom.mak 2004-04-22 08:18:02.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,39 +21,33 @@ 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-r +ALLCFLAGS=-I..\hdr $(TARGETOPT) $(ALLCFLAGS)-zq-os-s-e5-j-zl-zp1-wx-we-zgf-zff-r-d1 INITCFLAGS=$(ALLCFLAGS)-ntINIT_TEXT-gTGROUP-ndI CFLAGS=$(ALLCFLAGS)-ntHMA_TEXT -------------------------------------------------------- This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek For a limited time only, get FREE Ground shipping on all orders of $35 or more. Hurry up and shop folks, this offer expires April 30th! http://www.thinkgeek.com/freeshipping/?cpg=12297 _______________________________________________ Freedos-kernel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freedos-kernel
--- End Message ---
