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

Timestamp:

Apr 30, 2002, 9:45:53 PM (23 years ago)

Author:

bird

Message:

Changed 16-bit compiler to *mscv6-16.mk and the 32-bit one use *mscv6.mk.

File:

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

trunk/make/setup.os2debmscv6.mk

@@ -1 @@
-# $Id: setup.os2debmscv6.mk,v 1.5 2002-04-30 06:20:03 bird Exp $
+# $Id: setup.os2debmscv6.mk,v 1.6 2002-04-30 19:45:53 bird Exp $
 
 # ---OS2, DEBUG, MSCV6-------------------------
-ENV_NAME="OS/2, Debug, Microsoft C v6.0a"
+ENV_NAME="OS/2, Debug, Microsoft C v6.0a 32-bit"
 ENV_STATUS=OK
 !if "$(ENV_ENVS)" == ""
@@ -21 +21 @@
 #
 AR=ilib.exe
-CC=cl.exe
+CC=cl386.exe
 CXX=false
 LINK=ilink.exe
@@ -49 +49 @@
 _CC_DEFAULT_LIBS = /Zl
 _CC_PACK         = /Zp
-_CC_MODEL        = /Asfw
+_CC_MODEL        =
 
 !ifdef ALL_SEG_TEXT
@@ -72 +72 @@
 _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)
+!if defined(CXX_MODEL) || defined(ALL_MODEL)
+! if [$(ECHO) warning: CXX_MODEL/ALL_MODEL isn't supported by this compiler$(CLRRST)]
+! endif
 !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=/nologo /c /DDEBUG /DOS2 /D__32BIT__ /D__i386__ /W0 /G3 /Zi $(_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_SYS=$(CC_FLAGS) /DRING0
+CC_FLAGS_SYS=$(CC_FLAGS) /DRING0 /Gs /Owis
 CC_FLAGS_IFS=$(CC_FLAGS_SYS)
 CC_OBJ_OUT=/Fo
-CC_LST_OUT=/Fa
-CC_PC_2_STDOUT=/P /E
+CC_LST_OUT=/Fl
+CC_PC_2_STDOUT=/P /C /E
 
 CXX_FLAGS=
@@ -115 +92 @@
 CXX_FLAGS_DLL=
 CXX_FLAGS_SYS=
-CC_FLAGS_IFS=
+CXX_FLAGS_IFS=
 CXX_OBJ_OUT=
+CXX_LST_OUT=
 CXX_PC_2_STDOUT=
 
@@ -147 +125 @@
 # Libraries and object files.
 #
-LIB_OS      = os2286.lib
-LIB_C_OBJ   = clibcep.lib
-LIB_C_DLL   = clibcep.lib
-LIB_C_RTDLL = clibcep.lib
+LIB_OS      = os2386.lib
+LIB_C_OBJ   = libc.lib
+LIB_C_DLL   = libc.lib
+LIB_C_RTDLL = libc.lib
 LIB_C_NRE   =
 LIB_C_DMNGL =