Changeset 9348 for trunk/make

Timestamp:

Oct 15, 2002, 2:15:11 PM (23 years ago)

Author:

bird

Message:

Added: Segment fixed/floating and readonly string options.

File:

• trunk/make/setup.optional.watcom11x.mk (modified) (7 diffs)

trunk/make/setup.optional.watcom11x.mk

@@ -1 @@
-# $Id: setup.optional.watcom11x.mk,v 1.10 2002-09-20 04:10:02 bird Exp $
+# $Id: setup.optional.watcom11x.mk,v 1.11 2002-10-15 12:15:11 bird Exp $
 
 #
@@ -26 +26 @@
 _CC_DEF_MODEL   = FLAT
 !endif
+_CC_RO_STRINGS  =
+_CC_DS          =
+_CC_FS          =
+_CC_GS          =
 _CC_OPT_R       =
 _CC_O_INLINE_USER =
@@ -126 +130 @@
 
 # watcom options.
+!if defined(CC_READONLY_STRINGS) || defined(ALL_READONLY_STRINGS)
+_CC_RO_STRINGS = -zc
+!endif
+
+!if defined(CC_FIXED_DS) || defined(ALL_FIXED_DS)
+_CC_DS          = -zdp
+!endif
+!if defined(CC_NO_FIXED_DS) || defined(ALL_NO_FIXED_DS)
+_CC_DS          = -zdf
+!endif
+
+!if defined(CC_FIXED_FS) || defined(ALL_FIXED_FS)
+_CC_FS          = -zfp
+!endif
+!if defined(CC_NO_FIXED_FS) || defined(ALL_NO_FIXED_FS)
+_CC_FS          = -zff
+!endif
+
+!if defined(CC_FIXED_GS) || defined(ALL_FIXED_GS)
+_CC_GS          = -zgp
+!endif
+!if defined(CC_NO_FIXED_GS) || defined(ALL_NO_FIXED_GS)
+_CC_GS          = -zgf
+!endif
+
 !if defined(CC_SAVE_SEGS_ACCROSS_CALLS) || defined(ALL_SAVE_SEGS_ACCROSS_CALLS)
 _CC_OPT_R = -r
@@ -181 +210 @@
 
 _CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_SEG_TEXT_CLASS) $(_CC_DEFAULT_LIBS) \
-               $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) $(_CC_OPT_R) $(_CC_CPU) $(_CC_OPTIM)
+               $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) $(_CC_RO_STRINGS) $(_CC_OPT_R) $(_CC_CPU) $(_CC_OPTIM) \
+               $(_CC_DS) $(_CC_FS) $(_CC_GS)
 
 
@@ -204 +234 @@
 _CXX_DEF_MODEL   = FLAT
 !endif
+_CXX_RO_STRINGS  =
+_CXX_DS          =
+_CXX_FS          =
+_CXX_GS          =
 _CXX_OPT_R       =
 _CXX_O_INLINE_USER =
@@ -315 +349 @@
 ! error Invalid MODEL. CXX_MODEL=$(CXX_MODEL)
 !endif
+
+# watcom options
+!if defined(CXX_READONLY_STRINGS) || defined(ALL_READONLY_STRINGS)
+_CXX_RO_STRINGS = -zc
+!endif
+
+!if defined(CXX_FIXED_DS) || defined(ALL_FIXED_DS)
+_CXX_DS          = -zdp
+!endif
+!if defined(CXX_NO_FIXED_DS) || defined(ALL_NO_FIXED_DS)
+_CXX_DS          = -zdf
+!endif
+
+!if defined(CXX_FIXED_FS) || defined(ALL_FIXED_FS)
+_CXX_FS          = -zfp
+!endif
+!if defined(CXX_NO_FIXED_FS) || defined(ALL_NO_FIXED_FS)
+_CXX_FS          = -zff
+!endif
+
+!if defined(CXX_FIXED_GS) || defined(ALL_FIXED_GS)
+_CXX_GS          = -zgp
+!endif
+!if defined(CXX_NO_FIXED_GS) || defined(ALL_NO_FIXED_GS)
+_CXX_GS          = -zgf
+!endif
+
 !if defined(CXX_SAVE_SEGS_ACCROSS_CALLS) || defined(ALL_SAVE_SEGS_ACCROSS_CALLS)
 _CXX_OPT_R = -r
@@ -371 +432 @@
 
 _CXX_OPTIONAL = $(_CXX_SEG_TEXT) $(_CXX_SEG_DATA) $(_CXX_SEG_XCPT) $(_CXX_SEG_TEXT_CLASS) $(_CXX_DEFAULT_LIBS) \
-                $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) $(_CXX_OPT_R) $(_CXX_CPU) $(_CXX_OPTIM)
+                $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) $(_CXX_RO_STRINGS) $(_CXX_OPT_R) $(_CXX_CPU) $(_CXX_OPTIM) \
+                $(_CXX_DS) $(_CXX_FS) $(_CXX_GS)