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

Timestamp:

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

Author:

bird

Message:

Merged in latest changes.

File:

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

trunk/make/setup.os2prfemx.mk

@@ -1 @@
-# $Id: setup.os2prfemx.mk,v 1.1 2002-04-30 22:40:17 bird Exp $
+# $Id: setup.os2prfemx.mk,v 1.2 2002-05-16 11:37:03 bird Exp $
 
 # ---OS2, PROFILE, EMX----------------------------
@@ -5 +5 @@
 ENV_STATUS=OK
 !if "$(ENV_ENVS)" == ""
-ENV_ENVS=vac308 emx
+ENV_ENVS=vac308 emx emxpgcc
 !else
-ENV_ENVS_FORCE=vac308 emx
+ENV_ENVS_FORCE=vac308 emx emxpgcc
 !endif
 SPACE=_
+!undef ENV_16BIT
 
 
@@ -74 +75 @@
 CXX_PC_2_STDOUT=-C -E
 
+!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=g++
+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)" != ""
+! if [@(ECHO) $(CLRERR)Error: CXX_AS_CC is not supported by this compiler!$(CLRRST)]
+! endif
+! error
+!endif
+
 IMPLIB_FLAGS=/NOI /Nologo
 
@@ -95 +115 @@
 LINK_LNK5=$(TARGET_DEF_LINK)
 
-RC_FLAGS=-r -n -i $(PATH_INCLUDE:;= -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