Changeset 679 for GPL/trunk/tools/header.mif

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• tools/header.mif (modified) (4 diffs)

GPL/trunk/tools/header.mif

@@ -17 +17 @@
 !endif
 WATCOM=$(%WATCOM)
-
-#Always build KEE version
-KEE = 1
 
 !if "$(DEBUG)" == "1"
@@ -44 +41 @@
 .SUFFIXES: .lst .obj .lib .cpp .cpp16 .c .c16 .asm .def
 
+CPPFLAGS = -xd
+ASFLAGS  = -Mb -Li -Sv:M510
+CFLAGS   = -bt=os2v2 -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
+CFLAGS16 = $(CFLAGS) -mc -zu -zc
+CFLAGS  += -mf
+
 !if "$(DEBUG)" == "1"
-CFLAGS = -dDEBUG -bt=os2v2 -hc -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
-CPPFLAGS= -xd
-ASFLAGS = -D:DEBUG -Mb -Li -Sv:M510
-!else
-CFLAGS = -bt=os2v2 -5r -omlinear -s -wx -ze -zdp -zl -zq -nt=CODE32 -zff -zgf -ei
-CPPFLAGS= -xd
-ASFLAGS = -Mb -Li -Sv:M510
+CFLAGS  += -dDEBUG -hc
+ASFLAGS += -D:DEBUG
 !endif
 
@@ -58 +56 @@
 !else
 CFLAGS += -zp4
-!endif
-
-!if $(KEE) == 1
-CFLAGS16 = $(CFLAGS) -mc -zu -zc
-CFLAGS += -mf -DKEE -DFLATSTACK
-ASFLAGS += -D:KEE -D:FLATSTACK
-!else
-CFLAGS16 = $(CFLAGS) -mc -zu -zc
-CFLAGS += -mf -DFLATSTACK
-ASFLAGS += -D:FLATSTACK
 !endif
 
@@ -91 +79 @@
 LINK = wlink $(LFLAGS)
 !else
-LD2TARGETFLAGS =/PDD /OLDcpp /map /linenumbers
+LD2TARGETFLAGS = /PDD /nologo /noe /packcode /packdata /nod /OLDcpp
 !if "$(DEBUG)" == "1"
-LD2FLAGS = /nologo /noe /map /packcode /packdata /nod /debug $(LD2TARGETFLAGS)
+LD2FLAGS = /linenumbers /debug $(LD2TARGETFLAGS)
 !else
-LD2FLAGS = /nologo /noe /map /packcode /packdata /exepack:2 /nod $(LD2TARGETFLAGS)
+LD2FLAGS = /exepack:2 $(LD2TARGETFLAGS)
 !endif
 LINK = ilink $(LD2FLAGS)