diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 3d31e2c39..ed6210bb0 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -291,6 +291,10 @@ PATH_FILTER = $(1) COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG) COMPILE.cpp = $(CCC) -c $(CPPFLAGS) $(CXXFLAGS) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_CXXFLAG) +#-------------------------------------------------- +# C preprocessor command +PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@ + #-------------------------------------------------- # Depends command diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index e8b803f7a..4d23868d8 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -134,6 +134,11 @@ LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS) CFLAGS_ctdt = $(filter-out -pedantic,$(CFLAGS)) -fdollars-in-identifiers COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(call PATH_FILTER,$(INCLUDES)) $(SOURCE_FLAG) +#-------------------------------------------------- +# C preprocessor command +VXCPPFLAGS = $(filterout $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS)) +PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@ + #-------------------------------------------------- # Allow site overrides -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon diff --git a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland index f23e4d250..f20b2f006 100644 --- a/configure/os/CONFIG.win32-x86-borland.win32-x86-borland +++ b/configure/os/CONFIG.win32-x86-borland.win32-x86-borland @@ -84,7 +84,8 @@ OPT_CFLAGS_YES = -k- -H- -R- -O1 -v- -vi OPT_CFLAGS_NO = # OS vendor c preprocessor -CPP = $(BORLAND_BIN)/cl /E +CPP = $(BORLAND_BIN)/cpp32 -Sr +PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(subst /,\\,$(INCLUDES)) -o$@ $< # Configure OS vendor C++ compiler #