Changeset 9165 for trunk/make/setup.os2relwat11-16.mk

Timestamp:

Aug 29, 2002, 12:01:46 PM (23 years ago)

Author:

bird

Message:

Added new tools. Restructured tools. More options. Fixes.

File:

• trunk/make/setup.os2relwat11-16.mk (modified) (3 diffs)

trunk/make/setup.os2relwat11-16.mk

@@ -1 @@
-# $Id: setup.os2relwat11-16.mk,v 1.12 2002-08-28 05:02:22 bird Exp $
+# $Id: setup.os2relwat11-16.mk,v 1.13 2002-08-29 10:01:46 bird Exp $
 
 #
@@ -23 +23 @@
 #
 AS_DEBUG_TYPE   = Codeview
-!include $(PATH_MAKE)\setup.os2relalp.mk
+!include $(PATH_MAKE)\setup.os2as.mk
 !include $(PATH_MAKE)\setup.os2relrc.mk
 !include $(PATH_MAKE)\setup.os2relwrc.mk
-!ifdef LD_USE_ILINK
+_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
 LD_OLDCPP       = 1
-! include $(PATH_MAKE)\setup.os2relilink.mk
-!else
-_LD_LIBPATH     = $(PATH_WATCOM)\lib286\os2;$(PATH_WATCOM)\lib286;
-! include $(PATH_MAKE)\setup.os2relwlink.mk
-!endif
-!include $(PATH_MAKE)\setup.os2allilib.mk
+!include $(PATH_MAKE)\setup.os2ld.mk
+!include $(PATH_MAKE)\setup.os2ar.mk
 !include $(PATH_MAKE)\setup.optional.watcom11x.mk
 
@@ -47 +43 @@
 # The flags
 #
-_CC_FLAGS_OS =
-
-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
+!if "$(_CXX_OPTIM)" == ""
+_CC_OPTIM_ = -omlinear
+_CC_OPTIM_IFS = -out
+!else
+_CC_OPTIM_ =
+_CC_OPTIM_IFS =
+!endif
+CC_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -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) $(_CC_OPTIM_) -zc
+CC_FLAGS_DLL=$(CC_FLAGS) $(_CC_OPTIM_) -zc -bd
+CC_FLAGS_SYS=$(CC_FLAGS) $(_CC_OPTIM_) -s -zff -zgf -zu
 CC_FLAGS_VDD=$(CC_FLAGS_SYS)
-CC_FLAGS_IFS=$(CC_FLAGS) -out      -s -zff -zgf -zu -bd
+CC_FLAGS_IFS=$(CC_FLAGS) $(_CC_OPTIM_IFS) -s -zff -zgf -zu -bd
 CC_OBJ_OUT=-fo=
 CC_LST_OUT=
 CC_PC_2_STDOUT=-pc
 
-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
+!if "$(_CXX_OPTIM)" == ""
+_CXX_OPTIM_ = -omlinear
+!else
+_CXX_OPTIM_ =
+!endif
+CXX_FLAGS=-bt=os2 -dOS2 -d__16BIT__ -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) $(_CXX_OPTIM_) -zc
+CXX_FLAGS_DLL=$(CXX_FLAGS) $(_CXX_OPTIM_) -zc -bd
+CXX_FLAGS_SYS=$(CXX_FLAGS) $(_CXX_OPTIM_) -s -zff -zgf -zu
 CXX_FLAGS_VDD=$(CXX_FLAGS_SYS)
-CXX_FLAGS_IFS=$(CXX_FLAGS) -omlnaru  -s -zff -zgf -zdp -zu -bd
+CXX_FLAGS_IFS=$(CXX_FLAGS) $(_CXX_OPTIM_)  -s -zff -zgf -zdp -zu -bd
 CXX_OBJ_OUT=-fo=
 CXX_LST_OUT=