Changeset 9137 for trunk/make

Timestamp:

Aug 27, 2002, 5:03:14 AM (23 years ago)

Author:

bird

Message:

Flags adjustments.
Added options.

Location:

trunk/make

Files:

• setup.optional.watcom11x.mk (modified) (6 diffs)
• setup.os2debwat11-16.mk (modified) (4 diffs)
• setup.os2debwat11.mk (modified) (5 diffs)
• setup.os2relwat11-16.mk (modified) (4 diffs)
• setup.os2relwat11.mk (modified) (4 diffs)
• setup.win32debwat11.mk (modified) (2 diffs)

trunk/make/setup.optional.watcom11x.mk

@@ -1 @@
-# $Id: setup.optional.watcom11x.mk,v 1.3 2002-05-01 04:00:18 bird Exp $
+# $Id: setup.optional.watcom11x.mk,v 1.4 2002-08-27 03:03:13 bird Exp $
 
 #
@@ -10 +10 @@
 # This is not optional (but I'm getting lazy)
 #
-TOOL_DEFCONV    = $(PATH_TOOLS)\kDef2Wat.exe $(BUILD_PLATFORM)
+_LD_FORMAT = $(BUILD_PLATFORM)
+!ifdef LD_FORMAT
+! if "$(LD_FORMAT)" == "NE"
+_LD_FORMAT = $(BUILD_PLATFORM)-16
+! else
+!  if "$(LD_FORMAT)" == "LX"
+_LD_FORMAT = os2
+!  else
+!   error LD_FORMAT other than NE and LXis not supported by this compiler ($(ENV_NAME)).
+!  endif
+! endif
+!endif
+TOOL_DEFCONV    = $(PATH_TOOLS)\kDef2Wat.exe $(_LD_FORMAT)
+
 
 #
@@ -28 +41 @@
 _CC_DEF_MODEL    = FLAT
 !endif
+_CC_OPT_R        =
 
 !ifdef ALL_SEG_TEXT
@@ -107 +121 @@
 !endif
 
-_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL)
+!if defined(CC_SAVE_SEGS_ACCROSS_CALLS) || defined(ALL_SAVE_SEGS_ACCROSS_CALLS)
+_CC_OPT_R = -r
+!endif
+_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) \
+               $(_CC_OPT_R)
 
 
@@ -129 +147 @@
 _CXX_DEF_MODEL    = FLAT
 !endif
+_CXX_OPT_R        =
 
 !ifdef ALL_SEG_TEXT
@@ -219 +238 @@
 ! error Invalid MODEL. CXX_MODEL=$(CXX_MODEL)
 !endif
-
-_CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_DEFAULT_LIBS) $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL)
-
-
+!if defined(CXX_SAVE_SEGS_ACCROSS_CALLS) || defined(ALL_SAVE_SEGS_ACCROSS_CALLS)
+_CXX_OPT_R = -r
+!endif
+
+_CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_DEFAULT_LIBS) $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) \
+                $(_CXX_OPT_R)
+
+
+#
+# Linker flags.
+#
+_LD_SORT            = Sort global
+# Option
+_LD_QUIET           =
+_LD_DEFAULT_LIBS    = ,nodefaultlibs
+_LD_ALIGN           =
+_LD_DOSSEG          = ,dosseg
+
+!if defined(LD_SORT_GLOBAL)
+_LD_SORT    = Sort global
+!endif
+!if defined(LD_SORT_ALPHABETICAL)
+_LD_SORT    = Sort alphabetical
+!endif
+!if defined(LD_SORT_BOTH)
+_LD_SORT    = Sort global alphabetical
+!endif
+
+# Option
+!if defined(BUILD_QUIET)
+_LD_QUIET   = ,quiet
+!endif
+!if defined(LD_ALIGN)
+_LD_ALIGN   = ,alignment=$(LD_ALIGN)
+!endif
+!if defined(LD_DEFAULT_LIBS) || defined(ALL_DEFAULT_LIBS)
+_LD_DEFAULT_LIBS =
+!endif
+!if defined(LD_DOSSEG_NO)
+_LD_DOSSEG  =
+!endif
+!if defined(LD_DOSSEG_YES)
+_LD_DOSSEG  = ,dosseg
+!endif
+
+_LD_OPTIONAL = $(_LD_SORT) Option verbose $(_LD_QUIET) $(_LD_ALIGN) $(_LD_DOSSEG)
+

trunk/make/setup.os2debwat11-16.mk

@@ -1 @@
-# $Id: setup.os2debwat11-16.mk,v 1.10 2002-08-24 22:33:12 bird Exp $
+# $Id: setup.os2debwat11-16.mk,v 1.11 2002-08-27 03:03:13 bird Exp $
 
 # ---OS2, DEBUG, WAT11-------------------------
@@ -15 +15 @@
 # Include some shared standard stuff: ALP, VAC optional stuff.
 #
+AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2debalp.mk
 !include $(PATH_MAKE)\setup.os2prfwrc.mk
@@ -45 +46 @@
 AR_LNK4= "$(@R).lst";
 
-CC_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -zq -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CC_FLAGS_EXE=$(CC_FLAGS)
-CC_FLAGS_DLL=$(CC_FLAGS) -bd
-CC_FLAGS_SYS=$(CC_FLAGS) -s -zfp -zgp -zu
+CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -5 -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CC_FLAGS_EXE=$(CC_FLAGS) -zc
+CC_FLAGS_DLL=$(CC_FLAGS) -zc -bd
+CC_FLAGS_SYS=$(CC_FLAGS) -s -zff -zgf -zu
 CC_FLAGS_VDD=$(CC_FLAGS_SYS)
-CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
+CC_FLAGS_IFS=$(CC_FLAGS) -s -zff -zgf -zu -bd
 CC_OBJ_OUT=-fo=
 CC_LST_OUT=
 CC_PC_2_STDOUT=-pc
 
-CXX_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -zq -bm -ze -w4 -d2 -hc -zc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CXX_FLAGS_EXE=$(CXX_FLAGS)
-CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
-CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zfp -zgp -zu
+CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -dDEBUG -5 -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS_EXE=$(CXX_FLAGS) -zc
+CXX_FLAGS_DLL=$(CXX_FLAGS) -zc -bd
+CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zff -zgf -zu
 CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
-CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -bd
+CXX_FLAGS_IFS=$(CXX_FLAGS) -s -zff -zgf -zdp -zu -bd
 CXX_OBJ_OUT=-fo=
 CXX_LST_OUT=
@@ -89 +90 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact, MAXErrors=20
+LINK_FLAGS=Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) Debug codeview all
 LINK_FLAGS_EXE=$(LINK_FLAGS)
 LINK_FLAGS_DLL=$(LINK_FLAGS)
-LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
+LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
-LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
+LINK_FLAGS_IFS=$(LINK_FLAGS) segment type code preload segment type data preload
 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)

trunk/make/setup.os2debwat11.mk

@@ -1 @@
-# $Id: setup.os2debwat11.mk,v 1.12 2002-08-24 22:33:12 bird Exp $
+# $Id: setup.os2debwat11.mk,v 1.13 2002-08-27 03:03:14 bird Exp $
 
 # ---OS2, DEBUG, WAT11-------------------------
@@ -15 +15 @@
 # Include some shared standard stuff: ALP, VAC optional stuff.
 #
+AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2debalp.mk
 !include $(PATH_MAKE)\setup.os2prfwrc.mk
@@ -45 +46 @@
 AR_LNK4= "$(@R).lst";
 
-CC_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CC_FLAGS_EXE=$(CC_FLAGS)
-CC_FLAGS_DLL=$(CC_FLAGS) -bd
-CC_FLAGS_SYS=$(CC_FLAGS) -s -zdp -zff -zgf
+CC_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld -d2 -hc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CC_FLAGS_EXE=$(CC_FLAGS) -zc
+CC_FLAGS_DLL=$(CC_FLAGS) -zc -bd
+CC_FLAGS_SYS=$(CC_FLAGS) -s -zdp -zff -zgf -zu
 CC_FLAGS_VDD=$(CC_FLAGS_SYS)
 CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
@@ -55 +56 @@
 CC_PC_2_STDOUT=-pc
 
-CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -d2 -hc -zc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CXX_FLAGS_EXE=$(CXX_FLAGS)
-CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
-CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zdp -zff -zgf
+CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld -d2 -hc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS_EXE=$(CXX_FLAGS) -zc
+CXX_FLAGS_DLL=$(CXX_FLAGS) -zc -bd
+CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zdp -zff -zgf -zu
 CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
 CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -bd
@@ -89 +90 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
+LINK_FLAGS=Option eliminate, manglednames, caseexact, cache $(_LD_OPTIONAL) Debug codeview all
 LINK_FLAGS_EXE=$(LINK_FLAGS)
 LINK_FLAGS_DLL=$(LINK_FLAGS)
-LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
+LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
-LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
+LINK_FLAGS_IFS=$(LINK_FLAGS_DLL) segment type code preload segment type data preload
 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)

trunk/make/setup.os2relwat11-16.mk

@@ -1 @@
-# $Id: setup.os2relwat11-16.mk,v 1.8 2002-08-24 22:33:13 bird Exp $
+# $Id: setup.os2relwat11-16.mk,v 1.9 2002-08-27 03:03:14 bird Exp $
+
+#
+# Note! Watcom is unable to do debug info release builds.
+#       Because of a compiler bug which makes it emit code with
+#       no optimizations.
+#       Another reason is that lxlite isn't able to strip it.
+#
 
 # ---OS2, RELEASE, WAT11-------------------------
@@ -15 +22 @@
 # Include some shared standard stuff: ALP, WRC, VAC optional stuff.
 #
+AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2relalp.mk
 !include $(PATH_MAKE)\setup.os2relwrc.mk
@@ -47 +55 @@
 _CC_FLAGS_OS =
 
-# Note: wlink doesn't like 16-bit objects with debuginfo if Debug is disabled. (Failes on make\testcase.)
-CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -omlinear -zq -bm -ze -w4 -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CC_FLAGS_EXE=$(CC_FLAGS)
-CC_FLAGS_DLL=$(CC_FLAGS) -bd
-CC_FLAGS_SYS=$(CC_FLAGS) -s -zfp -zgp -zu
+CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CC_FLAGS_EXE=$(CC_FLAGS) -omlinear -zc
+CC_FLAGS_DLL=$(CC_FLAGS) -omlinear -zc -bd
+CC_FLAGS_SYS=$(CC_FLAGS) -omlinear -s -zff -zgf -zu
 CC_FLAGS_VDD=$(CC_FLAGS_SYS)
-CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
+CC_FLAGS_IFS=$(CC_FLAGS) -out      -s -zff -zgf -zu -bd
 CC_OBJ_OUT=-fo=
 CC_LST_OUT=
 CC_PC_2_STDOUT=-pc
 
-# Note: wlink doesn't like 16-bit objects with debuginfo if Debug is disabled. (paranoia since CC failed)
-CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -omlinear -zq -bm -ze -w4 -zc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CXX_FLAGS_EXE=$(CXX_FLAGS)
-CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
-CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zfp -zgp -zu
+CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -5 -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS_EXE=$(CXX_FLAGS) -omlinear -zc
+CXX_FLAGS_DLL=$(CXX_FLAGS) -omlinear -zc -bd
+CXX_FLAGS_SYS=$(CXX_FLAGS) -omlinear -s -zff -zgf -zu
 CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
-CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -bd
+CXX_FLAGS_IFS=$(CXX_FLAGS) -omlnaru  -s -zff -zgf -zdp -zu -bd
 CXX_OBJ_OUT=-fo=
 CXX_LST_OUT=
@@ -93 +99 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
+LINK_FLAGS=Sort global Option eliminate, manglednames, caseexact, verbose, cache $(_LD_OPTIONAL) #Debug codeview all
 LINK_FLAGS_EXE=$(LINK_FLAGS)
 LINK_FLAGS_DLL=$(LINK_FLAGS)
-LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
+LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
-LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
-LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
-LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)
-LINK_CMD_SYS=$(LINK) $(LINK_FLAGS_SYS) @$(TARGET_LNK)
-LINK_CMD_VDD=$(LINK) $(LINK_FLAGS_VDD) @$(TARGET_LNK)
-LINK_CMD_IFS=$(LINK) $(LINK_FLAGS_IFS) @$(TARGET_LNK)
+LINK_FLAGS_IFS=$(LINK_FLAGS) segment type code preload segment type data preload
+LINK_CMD_EXE=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_EXE)
+LINK_CMD_DLL=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_DLL)
+LINK_CMD_SYS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_SYS)
+LINK_CMD_VDD=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_VDD)
+LINK_CMD_IFS=$(LINK) @$(TARGET_LNK)  $(LINK_FLAGS_IFS)
 LINK_LNK1=file       $(TARGET_OBJS: =^
 file       )

trunk/make/setup.os2relwat11.mk

@@ -1 @@
-# $Id: setup.os2relwat11.mk,v 1.5 2002-08-24 22:33:13 bird Exp $
+# $Id: setup.os2relwat11.mk,v 1.6 2002-08-27 03:03:14 bird Exp $
+
+#
+# Note! Watcom is unable to do debug info release builds.
+#       Because of a compiler bug which makes it emit code with
+#       no optimizations.
+#       Another reason is that lxlite isn't able to strip it.
+#
 
 # ---OS2, RELEASE, WAT11-------------------------
@@ -15 +22 @@
 # Include some shared standard stuff: ALP, VAC optional stuff.
 #
+AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2relalp.mk
 !include $(PATH_MAKE)\setup.os2relwrc.mk
@@ -45 +53 @@
 AR_LNK4= "$(@R).lst";
 
-
-CC_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -omlinear -5r -zq -bm -ze -w4 -d2 -hc -zc $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CC_FLAGS_EXE=$(CC_FLAGS)
-CC_FLAGS_DLL=$(CC_FLAGS) -bd
-CC_FLAGS_SYS=$(CC_FLAGS) -s -zdp -zff -zgf
+CC_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CC_FLAGS_EXE=$(CC_FLAGS) -omlinear -zc
+CC_FLAGS_DLL=$(CC_FLAGS) -omlinear -zc -bd
+CC_FLAGS_SYS=$(CC_FLAGS) -omlinear -s -zdp -zff -zgf -zu
 CC_FLAGS_VDD=$(CC_FLAGS_SYS)
-CC_FLAGS_IFS=$(CC_FLAGS_SYS) -bd
+CC_FLAGS_IFS=$(CC_FLAGS_SYS) -omlnaru -bd
 CC_OBJ_OUT=-fo=
 CC_LST_OUT=
 CC_PC_2_STDOUT=-pc
 
-CXX_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -omlinear -5r -zq -bm -ze -w4 -d2 -hc -zc $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
-CXX_FLAGS_EXE=$(CXX_FLAGS)
-CXX_FLAGS_DLL=$(CXX_FLAGS) -bd
-CXX_FLAGS_SYS=$(CXX_FLAGS) -s -zdp -zff -zgf
+CXX_FLAGS=-bt=os2v2 -dOS2 -d__32BIT__ -d__i386__ -5r -zq -bm -ze -w4 -zld $(_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS_EXE=$(CXX_FLAGS) -omlinear -zc
+CXX_FLAGS_DLL=$(CXX_FLAGS) -omlinear -zc -bd
+CXX_FLAGS_SYS=$(CXX_FLAGS) -omlinear -omlinear -s -zdp -zff -zgf -zu
 CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
-CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -bd
+CXX_FLAGS_IFS=$(CXX_FLAGS_SYS) -omlnaru -bd
 CXX_OBJ_OUT=-fo=
 CXX_LST_OUT=
@@ -90 +97 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
+LINK_FLAGS=Option eliminate, manglednames, caseexact, cache $(_LD_OPTIONAL) #Debug codeview all
 LINK_FLAGS_EXE=$(LINK_FLAGS)
 LINK_FLAGS_DLL=$(LINK_FLAGS)
-LINK_FLAGS_SYS=$(LINK_FLAGS) Option oneautodata, internalrelocs, togglerelocs
+LINK_FLAGS_SYS=$(LINK_FLAGS) segment type code preload segment type data preload Option internalrelocs, togglerelocs
 LINK_FLAGS_VDD=$(LINK_FLAGS_SYS)
-LINK_FLAGS_IFS=$(LINK_FLAGS_SYS)
+LINK_FLAGS_IFS=$(LINK_FLAGS_DLL) segment type code preload segment type data preload
 LINK_CMD_EXE=$(LINK) $(LINK_FLAGS_EXE) @$(TARGET_LNK)
 LINK_CMD_DLL=$(LINK) $(LINK_FLAGS_DLL) @$(TARGET_LNK)

trunk/make/setup.win32debwat11.mk

@@ -1 @@
-# $Id: setup.win32debwat11.mk,v 1.7 2002-08-24 22:33:13 bird Exp $
+# $Id: setup.win32debwat11.mk,v 1.8 2002-08-27 03:03:14 bird Exp $
 
 # ---WIN32, DEBUG, WAT11-------------------------
@@ -14 +14 @@
 # Include some shared standard stuff: ALP, optional stuff.
 #
+AS_DEBUG_TYPE = Codeview
 !include $(PATH_MAKE)\setup.os2debalp.mk
 !include $(PATH_MAKE)\setup.os2debwrc.mk