Changeset 8334 for trunk/make/setup.os2debmscv6.mk

Timestamp:

Apr 30, 2002, 8:20:04 AM (23 years ago)

Author:

bird

Message:

Build level. optional C/C++ flags.

File:

• trunk/make/setup.os2debmscv6.mk (modified) (4 diffs)

trunk/make/setup.os2debmscv6.mk

@@ -1 @@
-# $Id: setup.os2debmscv6.mk,v 1.4 2002-04-22 02:09:27 bird Exp $
+# $Id: setup.os2debmscv6.mk,v 1.5 2002-04-30 06:20:03 bird Exp $
 
 # ---OS2, DEBUG, MSCV6-------------------------
@@ -5 +5 @@
 ENV_STATUS=OK
 !if "$(ENV_ENVS)" == ""
-ENV_ENVS=mscv6
+ENV_ENVS=vac308 mscv6
 !else
-ENV_ENVS_FORCE=mscv6
+ENV_ENVS_FORCE=vac308 mscv6
 !endif
 
@@ -40 +40 @@
 AR_LNK2= $(@R).lst
 
-CC_FLAGS=-DDEBUG -DOS2 -c -W0 -Asfw $(CC_SEGS) -G2s -Zp -Zl -nologo -Zi -Owis $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) -I$(PATH_INCLUDES)
-CC_FLAGS_EXE=$(CC_FLAGS) /Lp
+
+#
+# C Compiler flags.
+#
+_CC_SEG_TEXT     =
+_CC_SEG_DATA     =
+_CC_SEG_XCPT     =
+_CC_DEFAULT_LIBS = /Zl
+_CC_PACK         = /Zp
+_CC_MODEL        = /Asfw
+
+!ifdef ALL_SEG_TEXT
+_CC_SEG_TEXT=/NT$(ALL_SEG_TEXT)
+!endif
+!ifdef CC_SEG_TEXT
+_CC_SEG_TEXT=/NT$(CC_SEG_TEXT)
+!endif
+!ifdef ALL_SEG_DATA
+_CC_SEG_DATA=/ND$(ALL_SEG_TEXT)
+!endif
+!ifdef CC_SEG_DATA
+_CC_SEG_DATA=/ND$(CC_SEG_TEXT)
+!endif
+!if defined(CC_DEFAULT_LIBS) || defined(ALL_DEFAULT_LIBS)
+_CC_DEFAULT_LIBS =
+!endif
+!ifdef ALL_PACK
+_CC_PACK        = /Zp$(ALL_PACK)
+!endif
+!ifdef CC_PACK
+_CC_PACK        = /Zp$(CC_PACK)
+!endif
+!if !defined(CC_MODEL) && defined(ALL_MODEL)
+CC_MODEL    = $(ALL_MODEL)
+!endif
+!ifdef CC_MODEL
+_CC_MODEL   =
+!endif
+!if "$(CC_MODEL)" == "TINY"
+_CC_MODEL   = /AT
+!endif
+!if "$(CC_MODEL)" == "SMALL"
+_CC_MODEL   = /AS
+!endif
+!if "$(CC_MODEL)" == "COMPACT"
+_CC_MODEL   = /AC
+!endif
+!if "$(CC_MODEL)" == "MEDIUM"
+_CC_MODEL   = /AM
+!endif
+!if "$(CC_MODEL)" == "LARGE"
+_CC_MODEL   = /AL
+!endif
+!if "$(CC_MODEL)" == "HUGE"
+_CC_MODEL   = /AH
+!endif
+!if "$(_CC_MODEL)" == ""
+! error Invalid MODEL. CC_MODEL=$(CC_MODEL)
+!endif
+
+_CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL)
+
+CC_FLAGS=/nologo /c /DDEBUG /DOS2 /W0 /G2s /Zi /Owis $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
+CC_FLAGS_EXE=$(CC_FLAGS)
 CC_FLAGS_DLL=$(CC_FLAGS)
-CC_FLAGS_CRT=$(CC_FLAGS)
 CC_FLAGS_SYS=$(CC_FLAGS) /DRING0
 CC_FLAGS_IFS=$(CC_FLAGS_SYS)
-CC_OBJ_OUT=-Fo
-CC_PC_2_STDOUT=-P -E
+CC_OBJ_OUT=/Fo
+CC_LST_OUT=/Fa
+CC_PC_2_STDOUT=/P /E
 
 CXX_FLAGS=
 CXX_FLAGS_EXE=
 CXX_FLAGS_DLL=
-CXX_FLAGS_CRT=
 CXX_FLAGS_SYS=
 CC_FLAGS_IFS=
@@ -60 +121 @@
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=/nologo /de /map /NOE /NOD /Optfunc /PackCode /PackData
+LINK_FLAGS=/nofree /nologo /de /map /NOE /NOD /Optfunc /PACKCODE /PACKDATA
 LINK_FLAGS_EXE=$(LINK_FLAGS) /EXECutable /STACK:$(TARGET_STACKSIZE)
 LINK_FLAGS_DLL=$(LINK_FLAGS) /DLL
 LINK_FLAGS_SYS=$(LINK_FLAGS) /PDD /Align:16 /NOIgnorecase
+LINK_FLAGS_VDD=$(LINK_FLAGS) /VDD /Align:16 /NOIgnorecase
 LINK_FLAGS_IFS=$(LINK_FLAGS_DLL)
 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_LNK1=$(TARGET_OBJS: =^
-)
-LINK_LNK2=/OUT:$(TARGET)
-LINK_LNK3=/MAP:$(TARGET_MAP)
-LINK_LNK4=$(TARGET_LIBS: =^
-)
-LINK_LNK5=$(TARGET_DEF)
+LINK_LNK1=$(TARGET_OBJS: =+^
+),
+LINK_LNK2=$(TARGET),
+LINK_LNK3=$(TARGET_MAP),
+LINK_LNK4=$(TARGET_LIBS: =+^
+),
+LINK_LNK5=$(TARGET_DEF_LINK)
 
 RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)