Changeset 9180 for trunk/make

Timestamp:

Aug 30, 2002, 10:51:08 PM (23 years ago)

Author:

bird

Message:

CPU option naming.

File:

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

trunk/make/setup.optional.watcom11x.mk

@@ -1 @@
-# $Id: setup.optional.watcom11x.mk,v 1.7 2002-08-29 12:06:17 bird Exp $
+# $Id: setup.optional.watcom11x.mk,v 1.8 2002-08-30 20:51:08 bird Exp $
 
 #
@@ -35 +35 @@
 _CC_O_X     =
 !ifdef ENV_16BIT
-_CC_O_CPU   = -5
-!else
-_CC_O_CPU   = -5r
+_CC_CPU   = -5
+!else
+_CC_CPU   = -5r
 !endif
 
@@ -164 +164 @@
 !endif
 
-!if defined(ALL_O_CPU)
-! ifdef ENV_16BIT
-_CC_O_CPU   = -$(ALL_O_CPU)
-! else
-_CC_O_CPU   = -$(ALL_O_CPU)r
-! endif
-!endif
-!if defined(CC_O_CPU)
-! ifdef ENV_16BIT
-_CC_O_CPU   = -$(CC_O_CPU)
-! else
-_CC_O_CPU   = -$(CC_O_CPU)r
+!if defined(ALL_CPU)
+! ifdef ENV_16BIT
+_CC_CPU     = -$(ALL_CPU)
+! else
+_CC_CPU     = -$(ALL_CPU)r
+! endif
+!endif
+!if defined(CC_CPU)
+! ifdef ENV_16BIT
+_CC_CPU     = -$(CC_CPU)
+! else
+_CC_CPU     = -$(CC_CPU)r
 ! endif
 !endif
 
 _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_O_CPU) $(_CC_OPTIM)
+               $(_CC_PACK) $(_CC_MODEL) -d$(_CC_DEF_MODEL) $(_CC_OPT_R) $(_CC_CPU) $(_CC_OPTIM)
 
 
@@ -212 +212 @@
 _CXX_O_DISABLE =
 _CXX_O_X     =
-_CXX_O_CPU   =
+_CXX_CPU     =
 !ifdef ENV_16BIT
-_CXX_O_CPU   = -5
-!else
-_CXX_O_CPU   = -5r
+_CXX_CPU     = -5
+!else
+_CXX_CPU     = -5r
 !endif
 
@@ -354 +354 @@
 !endif
 
-!if defined(ALL_O_CPU)
-! ifdef ENV_16BIT
-_CXX_O_CPU   = -$(ALL_O_CPU)
-! else
-_CXX_O_CPU   = -$(ALL_O_CPU)r
-! endif
-!endif
-!if defined(CXX_O_CPU)
-! ifdef ENV_16BIT
-_CXX_O_CPU   = -$(CXX_O_CPU)
-! else
-_CXX_O_CPU   = -$(CXX_O_CPU)r
+!if defined(ALL_CPU)
+! ifdef ENV_16BIT
+_CXX_CPU     = -$(ALL_CPU)
+! else
+_CXX_CPU     = -$(ALL_CPU)r
+! endif
+!endif
+!if defined(CXX_CPU)
+! ifdef ENV_16BIT
+_CXX_CPU     = -$(CXX_CPU)
+! else
+_CXX_CPU     = -$(CXX_CPU)r
 ! endif
 !endif
 
 _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_O_CPU) $(_CXX_OPTIM)
-
+                $(_CXX_PACK) $(_CXX_XCPT) $(_CXX_MODEL) -d$(_CXX_DEF_MODEL) $(_CXX_OPT_R) $(_CXX_CPU) $(_CXX_OPTIM)
+