diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules index 39b61c9ff1..814b17ea4a 100644 --- a/build/jam/BeOSRules +++ b/build/jam/BeOSRules @@ -142,6 +142,7 @@ rule ResComp # get compiler and defines for the platform local cc ; local defines ; + local localIncludesOption ; on $(1) { # use on $(1) variable values defines = $(DEFINES) ; @@ -149,14 +150,18 @@ rule ResComp if $(PLATFORM) = host { defines += $(HOST_DEFINES) ; cc = $(HOST_CC) ; + localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ; } else { defines += $(TARGET_DEFINES) ; cc = $(TARGET_CC) ; + localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ; } } DEFINES on $(1) = $(defines) ; CCDEFS on $(1) = [ FDefines $(defines) ] ; + HDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) : $(localIncludesOption) ] ; + RCHDRS on $(1) = [ FIncludes $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) : "-I " ] ; CC on $(1) = $(cc) ; # set up other vars @@ -172,5 +177,5 @@ rule ResComp actions ResComp1 { $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - cat $(2[2]) | $(CC) -E $(CCDEFS) - | egrep -v '^#' | $(2[1]) --auto-names -o $(1) - + cat $(2[2]) | $(CC) -E $(CCDEFS) $(HDRS) - | egrep -v '^#' | $(2[1]) $(RCHDRS) --auto-names -o $(1) - }