i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provided a fix for the build of resources, hope I didn't do bad things

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-08-07 12:07:05 +00:00
parent 1564b19c80
commit 049112799e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BeOSRules
+6 -1
View File
@@ -142,6 +142,7 @@ rule ResComp
# get compiler and defines for the platform # get compiler and defines for the platform
local cc ; local cc ;
local defines ; local defines ;
local localIncludesOption ;
on $(1) { # use on $(1) variable values on $(1) { # use on $(1) variable values
defines = $(DEFINES) ; defines = $(DEFINES) ;
@@ -149,14 +150,18 @@ rule ResComp
if $(PLATFORM) = host { if $(PLATFORM) = host {
defines += $(HOST_DEFINES) ; defines += $(HOST_DEFINES) ;
cc = $(HOST_CC) ; cc = $(HOST_CC) ;
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
} else { } else {
defines += $(TARGET_DEFINES) ; defines += $(TARGET_DEFINES) ;
cc = $(TARGET_CC) ; cc = $(TARGET_CC) ;
localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
} }
} }
DEFINES on $(1) = $(defines) ; DEFINES on $(1) = $(defines) ;
CCDEFS on $(1) = [ FDefines $(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) ; CC on $(1) = $(cc) ;
# set up other vars # set up other vars
@@ -172,5 +177,5 @@ rule ResComp
actions ResComp1 actions ResComp1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(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) -
} }