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

Timestamp:

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

Author:

bird

Message:

Merged in latest changes.

File:

• trunk/make/setup.os2relmscv6-16.mk (modified) (4 diffs)

trunk/make/setup.os2relmscv6-16.mk

@@ -1 @@
-# $Id: setup.os2relmscv6-16.mk,v 1.2 2002-04-30 22:42:49 bird Exp $
+# $Id: setup.os2relmscv6-16.mk,v 1.3 2002-05-16 11:37:04 bird Exp $
 
 # ---OS2, RELEASE, MSCV6-------------------------
@@ -103 +103 @@
 _CC_OPTIONAL = $(_CC_SEG_TEXT) $(_CC_SEG_DATA) $(_CC_SEG_XCPT) $(_CC_DEFAULT_LIBS) $(_CC_PACK) $(_CC_MODEL)
 
-CC_FLAGS=/nologo /c /DDEBUG /DOS2 /D__16BIT__ /W0 /G2 /Ogeitln /Zi $(_CC_OPTIONAL) $(CC_DEFINES) $(ALL_DEFINES) $(BUILD_DEFINES) $(CC_INCLUDES) $(ALL_INCLUDES) /I$(PATH_INCLUDES)
+CC_FLAGS=/nologo /c /DOS2 /D__16BIT__ /W0 /G2 /Ogeitln /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)
@@ -120 +120 @@
 CXX_LST_OUT=
 CXX_PC_2_STDOUT=
+
+!if "$(CC_AS_CXX)" != ""
+! if [@(ECHO) $(CLRERR)Error: CC_AS_CXX is not supported by this compiler!$(CLRRST)]
+! endif
+! error
+!endif
+!if "$(CXX_AS_CC)" != ""
+! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
+! endif
+! error
+!endif
 
 IMPLIB_FLAGS=/NOI /Nologo
@@ -142 +153 @@
 LINK_LNK5=$(TARGET_DEF_LINK)
 
-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