sbsv2/raptor/lib/flm/resource.flm
branchfix
changeset 470 f45853a5ce36
parent 466 b9e5cf94aac3
child 471 8786668610ae
equal deleted inserted replaced
469:6af83cc4c38a 470:f45853a5ce36
   115 CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
   115 CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
   116  -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-iquote $(I) ) $(foreach J,$(SYSTEMINCLUDE),-I $(J) )
   116  -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-iquote $(I) ) $(foreach J,$(SYSTEMINCLUDE),-I $(J) )
   117 
   117 
   118 CREATABLEPATHS:=$(RSCDIR) $(RSGDIR) $(OUTPUTPATH)
   118 CREATABLEPATHS:=$(RSCDIR) $(RSGDIR) $(OUTPUTPATH)
   119 
   119 
   120 # We intend to generate the resource in an intermediate locationand copy to the final destination to
   120 # We intend to generate the resource in an intermediate location and copy to the targetpath to
   121 # ensure that when the "same" resource is built into separare locations it is 
   121 # ensure that when the "same" resource is built into separare target paths, it doesn't have to be 
       
   122 # completely recreated each time - just copied.
   122 RSCCOPYDIRS:=$(RSCDIR)
   123 RSCCOPYDIRS:=$(RSCDIR)
       
   124 
   123 # additional binary resource copies performed based on BINCOPYDIRS
   125 # additional binary resource copies performed based on BINCOPYDIRS
   124 ifneq ($(BINCOPYDIRS),)
   126 ifneq ($(BINCOPYDIRS),)
   125         RSCCOPYDIRS:=$(RSCCOPYDIRS) $(subst //,/,$(patsubst %,%/$(if $(TARGETPATH),/z/$(TARGETPATH),),$(BINCOPYDIRS)))
   127         RSCCOPYDIRS:=$(RSCCOPYDIRS) $(subst //,/,$(patsubst %,%/$(if $(TARGETPATH),/z/$(TARGETPATH),),$(BINCOPYDIRS)))
   126 endif
   128 endif
   127 CREATABLEPATHS:=$(CREATABLEPATHS) $(RSCCOPYDIRS)
   129 CREATABLEPATHS:=$(CREATABLEPATHS) $(RSCCOPYDIRS)
   145     # we can correct the dependencies by assuming that the file will be in epoc32\include as this is the default
   147     # we can correct the dependencies by assuming that the file will be in epoc32\include as this is the default
   146     ifneq ($(NO_DEPEND_GENERATE),)
   148     ifneq ($(NO_DEPEND_GENERATE),)
   147       # This version minimises the size of dependency files, to contain only .mbg and .rsg deps.
   149       # This version minimises the size of dependency files, to contain only .mbg and .rsg deps.
   148       # It allows resources to be built in the right order but doesn't impose the weight of
   150       # It allows resources to be built in the right order but doesn't impose the weight of
   149       # of full dependency information which can overwhelm make in large builds.
   151       # of full dependency information which can overwhelm make in large builds.
       
   152       # The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or 
       
   153       # .mbg dependencies in them. 
   150       DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '1 p;\% [^ \/]+\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
   154       DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '1 p;\% [^ \/]+\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
   151     else
   155     else
   152       # Generate full dependency information
   156       # Generate full dependency information
   153       DEPENDENCY_CORRECTOR:=$(GNUSED)  -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig'
   157       DEPENDENCY_CORRECTOR:=$(GNUSED)  -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig'
   154     endif
   158     endif