sbsv2/raptor/lib/flm/resource.flm
branchfix
changeset 471 8786668610ae
parent 470 f45853a5ce36
child 472 d1500715c073
equal deleted inserted replaced
470:f45853a5ce36 471:8786668610ae
   110 
   110 
   111 # make the output directories while reading makefile - some build engines prefer this
   111 # make the output directories while reading makefile - some build engines prefer this
   112 $(call makepath,$(INTERBASE))
   112 $(call makepath,$(INTERBASE))
   113 
   113 
   114 # common pre-processor options
   114 # common pre-processor options
       
   115 
       
   116 # We really should be using -iquote with a recent cpp.  This is a note for when we do update:
       
   117 #CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
       
   118 # -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-iquote $(I) ) $(foreach J,$(SYSTEMINCLUDE),-I $(J) )
       
   119 
   115 CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
   120 CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
   116  -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-iquote $(I) ) $(foreach J,$(SYSTEMINCLUDE),-I $(J) )
   121  -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-I$(I) ) -I- $(foreach J,$(SYSTEMINCLUDE),-I$(J) )
   117 
   122 
   118 CREATABLEPATHS:=$(RSCDIR) $(RSGDIR) $(OUTPUTPATH)
   123 CREATABLEPATHS:=$(RSCDIR) $(RSGDIR) $(OUTPUTPATH)
   119 
   124 
   120 # We intend to generate the resource in an intermediate location and copy to the targetpath to
   125 # 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 target paths, it doesn't have to be 
   126 # ensure that when the "same" resource is built into separare target paths, it doesn't have to be 
   234 			$(call startrule,resourcecompile,FORCESUCCESS) \
   239 			$(call startrule,resourcecompile,FORCESUCCESS) \
   235 			$(RCOMP) -m045,046,047 -u -o$(1) -s$(2) \
   240 			$(RCOMP) -m045,046,047 -u -o$(1) -s$(2) \
   236 			$(call endrule,resourcecompile)
   241 			$(call endrule,resourcecompile)
   237 
   242 
   238         endif
   243         endif
       
   244 
   239 #	Whether or not we have generated this resource for some other variant, check if there
   245 #	Whether or not we have generated this resource for some other variant, check if there
   240 #       are any new copies to be made for this variant. e.g. winscw requires that we make
   246 #       are any new copies to be made for this variant. e.g. winscw requires that we make
   241 #       some extra copies.
   247 #       some extra copies.
   242 
   248 
   243         $(if $(FLMDEBUG),$(info <debug>resource copies of $(notdir $1) in: $(RSCCOPYDIRS)</debug>))
   249         $(if $(FLMDEBUG),$(info <debug>resource copies of $(notdir $1) in: $(RSCCOPYDIRS)</debug>))
   244         $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(call copyresource,$(1),$(F)))
       
   245         $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(call copyresource,$(1),$(F)))
   250         $(foreach F,$(sort $(patsubst %,%/$(notdir $(1)),$(RSCCOPYDIRS))),$(call copyresource,$(1),$(F)))
   246 
   251 
   247         # individual source file compilation
   252         # individual source file compilation
   248         SOURCETARGET_$(call sanitise,$(SOURCE)): $(1)
   253         SOURCETARGET_$(call sanitise,$(SOURCE)): $(1)
   249 
   254