Changed build target directory to \*.R1 and simplified AddResources rule.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@45 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2002-07-10 17:54:11 +00:00
parent 05cce1aecd
commit 78599cf01d

View File

@ -14,12 +14,12 @@
# Cross compiling can come later
if $(METROWERKS) {
OBOS_TARGET ?= "ppc.R5" ;
OBOS_TARGET ?= "ppc.R1" ;
OBOS_TARGET_TYPE ?= "application/x-be-executable" ;
OBOS_ARCH ?= "ppc" ;
OBOS_TARGET_DEFINE ?= "ARCH_ppc" ;
} else {
OBOS_TARGET ?= "x86.R5" ;
OBOS_TARGET ?= "x86.R1" ;
OBOS_TARGET_TYPE ?= "application/x-vnd.Be-elfexecutable" ;
OBOS_ARCH ?= "x86" ;
OBOS_TARGET_DEFINE ?= "ARCH_x86" ;
@ -356,15 +356,8 @@ rule AddResources
{
# AddResources <name> : <resourcefiles> ;
local dir;
dir = [ FDirName $(OBOS_TOP) $(SUBDIR_TOKENS) ] ;
for i in $(>)
{
RESFILES on $(<) = [ FDirName $(dir) $(i) ] ;
DEPENDS $(<) : [ FDirName $(dir) $(i) ] ;
}
SEARCH on $(2) = $(SEARCH_SOURCE) ;
RESFILES on $(1) += $(2) ;
}
rule PublicHeaders