Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resource definition files (*.rdef) are now piped through the C preprocessor.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18413 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2006-08-06 12:38:30 +00:00
parent bc19ead830
commit b0634f6510
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build/jam/BeOSRules
View File

@ -139,6 +139,27 @@ rule ResComp
#
# <resource file> and <rdef file> must be gristed.
# get compiler and defines for the platform
local cc ;
local defines ;
on $(1) { # use on $(1) variable values
defines = $(DEFINES) ;
if $(PLATFORM) = host {
defines += $(HOST_DEFINES) ;
cc = $(HOST_CC) ;
} else {
defines += $(TARGET_DEFINES) ;
cc = $(TARGET_CC) ;
}
}
DEFINES on $(1) = $(defines) ;
CCDEFS on $(1) = [ FDefines $(defines) ] ;
CC on $(1) = $(cc) ;
# set up other vars
SEARCH on $(2) += $(SEARCH_SOURCE) ;
MakeLocateArch $(1) ;
Depends $(1) : $(2) <build>rc ;
@ -146,9 +167,10 @@ rule ResComp
ResComp1 $(1) : <build>rc $(2) ;
}
# Note: We pipe the file into the preprocessor, since *.rdef files are
# considered linker scripts.
actions ResComp1
{
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
$(2[1]) --auto-names -o $(1) $(2[2-])
cat $(2[2]) | $(CC) -E $(CCDEFS) - | egrep -v '^#' | $(2[1]) --auto-names -o $(1) -
}

1
build/jam/MainBuildRules
View File

@ -400,6 +400,7 @@ rule AddResources
file = $(rdef:S=.rsrc) ;
ResComp $(file) : $(rdef) ;
}
InheritPlatform $(file) : $(1) ;
RESFILES on $(1) += $(file) ;
}
}