Changeset 8423 for trunk/make/setup.os2debwat11-16.mk

Timestamp:

May 16, 2002, 1:37:08 PM (23 years ago)

Author:

bird

Message:

Merged in latest changes.

File:

• trunk/make/setup.os2debwat11-16.mk (modified) (6 diffs)

trunk/make/setup.os2debwat11-16.mk

@@ -1 @@
-# $Id: setup.os2debwat11-16.mk,v 1.2 2002-05-01 04:00:18 bird Exp $
+# $Id: setup.os2debwat11-16.mk,v 1.3 2002-05-16 11:37:01 bird Exp $
 
 # ---OS2, DEBUG, WAT11-------------------------
@@ -42 +42 @@
 AR_LNK2= $(@R).lst
 
-_CC_FLAGS_OS =
-
 CC_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -zq -bm -ze -w4 -d2 -hc -zc $(_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)
@@ -54 +52 @@
 CC_PC_2_STDOUT=-pc
 
-CXX_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -zq -bm -ze -w4 -d2 -hc -zc (_CXX_OPTIONAL)  $(CXX_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CXX_INCLUDES:-I=-i=) $(ALL_INCLUDES:-I=-i=) -i=$(PATH_INCLUDES) -i=$(WATCOM)\h
+CXX_FLAGS=-bt=os2 -dOS2 -dDEBUG -d__16BIT__ -5 -zq -bm -ze -w4 -d2 -hc -zc $(_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_FLAGS_DLL=$(CXX_FLAGS) -bd
@@ -64 +62 @@
 CXX_PC_2_STDOUT=-pc
 
+!if "$(CC_AS_CXX)" != ""
+! if "$(CXX_AS_CC)" != ""
+!  if [@(ECHO) $(CLRERR)Error: Do you think you're smart? CC_AS_CXX and CXX_AS_CC is mutual execlusive!$(CLRRST)]
+!  endif
+!  error
+! endif
+CC=$(CXX)
+CC_FLAGS_EXE=$(CXX_FLAGS_EXE)
+CC_FLAGS_DLL=$(CXX_FLAGS_DLL)
+CC_FLAGS_SYS=$(CXX_FLAGS_SYS)
+CC_FLAGS_VDD=$(CXX_FLAGS_VDD)
+CC_FLAGS_IFS=$(CXX_FLAGS_IFS)
+!endif
+!if "$(CXX_AS_CC)" != ""
+CXX=$(CC)
+CXX_FLAGS_EXE=$(C_FLAGS_EXE)
+CXX_FLAGS_DLL=$(C_FLAGS_DLL)
+CXX_FLAGS_SYS=$(C_FLAGS_SYS)
+CXX_FLAGS_VDD=$(C_FLAGS_VDD)
+CXX_FLAGS_IFS=$(C_FLAGS_IFS)
+!endif
+
 IMPLIB_FLAGS=/NOI /Nologo
 
-LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact
+LINK_FLAGS=Sort global Debug codeview Option quiet, dosseg, eliminate, manglednames, caseexact, MAXErrors=20
 LINK_FLAGS_EXE=$(LINK_FLAGS)
 LINK_FLAGS_DLL=$(LINK_FLAGS)
@@ -79 +99 @@
 LINK_LNK1=file       $(TARGET_OBJS: =^
 file       )
-LINK_LNK2=libpath    $(WATCOM)\lib386\os2;$(WATCOM)\lib386;
+LINK_LNK2=libpath    $(WATCOM)\lib286\os2;$(WATCOM)\lib286;
 LINK_LNK3=option map=$(TARGET_MAP)
 LINK_LNK4=library    $(TARGET_LIBS: =^, )
 LINK_LNK5=name       $(PATH_TARGET)\$(TARGET_NAME).$(TARGET_EXT)
 
-RC_FLAGS=-r -n -i $(PATH_INCLUDES:;= -i ) $(RC_DEFINES) $(RC_INCLUDES)
+RC_FLAGS=-r -n $(RC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(RC_INCLUDES:-I=-i ) $(ALL_INCLUDES:-I=-i ) -i $(PATH_INCLUDES:;= -i )
 RL_FLAGS=-x2 -n
 
@@ -94 +114 @@
 #
 LIB_OS      = os2286.lib
-LIB_C_OBJ   = clib$(_OBJ_MODEL).lib
-LIB_C_DLL   = clib$(_OBJ_MODEL).lib # clibdll.lib
-LIB_C_RTDLL = clib$(_OBJ_MODEL).lib # clibdll.lib
-LIB_C_NRE   = clib$(_OBJ_MODEL).lib
+
+_LIB_MT =
+!if "$(_OBJ_MODEL)" == "m"
+_LIB_MT = mt # this is the only one there is a MT edition of, don't know why.
+!endif
+!if "$(_CXX_XCPT)" != "-xs"
+LIB_C_OBJ   = clib$(_LIB_MT)$(_OBJ_MODEL).lib plib$(_LIB_MT)$(_OBJ_MODEL).lib math87$(_LIB_MT)$(_OBJ_MODEL).lib emu87.lib
+!else
+LIB_C_OBJ   = clib$(_LIB_MT)$(_OBJ_MODEL).lib plbx$(_LIB_MT)$(_OBJ_MODEL).lib math87$(_LIB_MT)$(_OBJ_MODEL).lib emu87.lib
+!endif
+LIB_C_DLL   = $(LIB_C_OBJ)  # clibdll.lib
+LIB_C_RTDLL = $(LIB_C_OBJ)  # clibdll.lib
+LIB_C_NRE   = $(LIB_C_OBJ)
 LIB_C_DMNGL =
 OBJ_PROFILE =
 
+
 # ---OS2, DEBUG, WAT11-------------------------