Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix: resource problem - horrible code that tries to produce different versions of the same resource - preevent file mixup in this case. fix
authortimothy.murphy@nokia.com
Sat, 01 May 2010 03:07:06 +0100
branchfix
changeset 535 3ed696bd9e5f
parent 534 3b10c85868b1
child 536 49d91f1e52a3
fix: resource problem - horrible code that tries to produce different versions of the same resource - preevent file mixup in this case.
sbsv2/raptor/lib/flm/resource.flm file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/lib/flm/resource.flm	Wed Apr 28 01:01:42 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Sat May 01 03:07:06 2010 +0100
@@ -64,7 +64,7 @@
 endif
 
 # we create intermediate .rpp and .d files
-INTERBASE:=$(OUTPUTPATH)/$(TARGET_lower)
+INTERBASE:=$(OUTPUTPATH)/$(TARGET_lower)_$(notdir $(SOURCE))
 
 ################################## localisation ###########################$(GNUMKDIR)#############
 # Only make copies for full resource builds
@@ -197,7 +197,7 @@
 
     endif
     ifeq "$(MAKEFILE_GROUP)" "RESOURCE"
-    $1: 
+    $1: $4.d
 	  $(call startrule,resourcepreprocess,FORCESUCCESS) \
 	  $(GNUCPP) -C -DLANGUAGE_$3 -DLANGUAGE_$(subst sc,SC,$(3)) $(call makemacrodef,-D,$(MMPDEFS))\
 	  $(CPPOPT) $(SOURCE) -o $$@ \
FCL/sftools/dev/build