sbsv2/raptor/lib/flm/resource.flm
branchfix
changeset 475 2b71dc28e5fc
parent 474 d22e74b2b0f8
child 479 62411a80435e
equal deleted inserted replaced
474:d22e74b2b0f8 475:2b71dc28e5fc
   227 
   227 
   228 
   228 
   229         ifeq ($(TARGET_$(call sanitise,$1)),)
   229         ifeq ($(TARGET_$(call sanitise,$1)),)
   230                 TARGET_$(call sanitise,$1):=1
   230                 TARGET_$(call sanitise,$1):=1
   231 
   231 
   232             $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),)
   232             $(if $(FLMDEBUG),$(info generateresource: $(1) from $(2) LANG:$(3)),)	
   233 
   233             $(if $(FLMDEBUG),$(info generateresource: copies: $(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS)))))
       
   234 
       
   235             CLEANTARGETS:=$$(CLEANTARGETS) $(1)
   234 
   236 
   235             RESOURCE:: $(1)
   237             RESOURCE:: $(1)
   236 
   238 
   237             $(1): $(2) $(RCOMP)
   239             $(1): $(2) $(RCOMP)
   238 			$(call startrule,resourcecompile,FORCESUCCESS) \
   240 			$(call startrule,resourcecompile,FORCESUCCESS) \
   239 			$(RCOMP) -m045,046,047 -u -o$(1) -s$(2) \
   241 			$(RCOMP) -m045,046,047 -u -o$(1) -s$(2) && \
       
   242         		{ $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(GNUCP) $(1) $(F) ; ) } \
   240 			$(call endrule,resourcecompile)
   243 			$(call endrule,resourcecompile)
   241 
   244 
   242         endif
   245         endif
   243 
   246 
   244 #	Whether or not we have generated this resource for some other variant, check if there
   247 #	Whether or not we have generated this resource for some other variant, check if there
   245 #       are any new copies to be made for this variant. e.g. winscw requires that we make
   248 #       are any new copies to be made for this variant. e.g. winscw requires that we make
   246 #       some extra copies.
   249 #       some extra copies.  We tried to copy after running rcomp itself but we still need these
       
   250 #       targets for the sake of dependencies or, for example if someone merely adds a new copy 
       
   251 #       when the resource is up-to-date
   247 
   252 
   248         $(if $(FLMDEBUG),$(info <debug>resource copies of $(notdir $1) in: $(RSCCOPYDIRS)</debug>))
   253         $(if $(FLMDEBUG),$(info <debug>resource copies of $(notdir $1) in: $(RSCCOPYDIRS)</debug>))
   249         $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(call copyresource,$(1),$(F)))
   254         $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(call copyresource,$(1),$(F)))
   250 
   255 
   251         # individual source file compilation
   256         # individual source file compilation