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

Timestamp:

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

Author:

bird

Message:

Merged in latest changes.

File:

• trunk/make/setup.os2debwat11.mk (modified) (8 diffs)

trunk/make/setup.os2debwat11.mk

@@ -1 @@
-# $Id: setup.os2debwat11.mk,v 1.7 2002-05-01 04:00:18 bird Exp $
+# $Id: setup.os2debwat11.mk,v 1.8 2002-05-16 11:37:02 bird Exp $
 
 # ---OS2, DEBUG, WAT11-------------------------
@@ -9 +9 @@
 ENV_ENVS_FORCE=vac308 watcomc11c
 !endif
+!undef ENV_16BIT
 
 
@@ -22 +23 @@
 #
 AR=ilib.exe
+AR=lib.exe
 CC=wcc386.exe
 CXX=wpp386.exe
@@ -35 +37 @@
 #
 AR_FLAGS=/nologo /noignorecase
-AR_CMD=$(AR) $(AR_FLAGS) $@ @$(TARGET_LNK)
-_AR_LNK1= "$(TARGET_OBJS: ="&^
+AR_CMD=$(AR) $(AR_FLAGS) @$(TARGET_LNK)
+_AR_LNK1= $(TARGET), ^
++"$(TARGET_OBJS: ="+^
 ")"
 AR_LNK1= $(_AR_LNK1:""=)
@@ -51 +54 @@
 CC_PC_2_STDOUT=-pc
 
-CXX_FLAGS=-bt=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -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=os2v2 -dDEBUG -dOS2 -d__32BIT__ -d__i386__ -5r -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
@@ -60 +63 @@
 CXX_LST_OUT=
 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
@@ -81 +106 @@
 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
 
@@ -89 +114 @@
 #
 LIB_OS      = os2386.lib
-LIB_C_OBJ   = clib3r.lib
-LIB_C_DLL   = clbrdll.lib
-LIB_C_RTDLL = clbrdll.lib
-LIB_C_NRE   = clib3r.lib
+!if "$(_CXX_XCPT)" == "-xd"
+LIB_C_OBJ   = clib3r.lib plibmt3r.lib math387r.lib emu387.lib
+LIB_C_DLL   = clbrdll.lib plbrdll.lib mt7rdll.lib emu387.lib
+LIB_C_RTDLL = clbrdll.lib  # TODO
+LIB_C_NRE   = $(LIB_C_OBJ) # TODO
+!else
+LIB_C_OBJ   = clib3r.lib plbxmt3r.lib math387r.lib emu387.lib
+LIB_C_DLL   = clbrdll.lib plbrdllx.lib mt7rdll.lib emu387.lib
+LIB_C_RTDLL = clbrdll.lib  # TODO
+LIB_C_NRE   = $(LIB_C_OBJ) # TODO
+!endif
 LIB_C_DMNGL =
 OBJ_PROFILE =