Mercurial Mercurial > oss > FCL > sftools > dev > ide > carbidecpp / 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.
Merge commit RCL_2_4
authorEd Swartz <ed.swartz@nokia.com>
Tue, 20 Apr 2010 15:36:33 -0500
branchRCL_2_4
changeset 1255 323d745d1d2e
parent 1254 0e45b6356eac (current diff)
parent 1253 75aabc8b4b41 (diff)
child 1256 501f8a427af1
Merge commit
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,11 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
-PRJ_EXPORTS
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_$(uid3).mif
+	OPTION HEADERFILE $(baseName$lower)_$(uid3).mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
 
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
+PRJ_MMPFILES
 $(baseName).mmp
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,9 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_aif.mif
+	OPTION HEADERFILE $(baseName$lower)_aif.mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
+
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
-$(baseName).mmp
+PRJ_MMPFILES
+$(baseName).mmp
\ No newline at end of file
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/bld.inf	Tue Apr 20 15:36:01 2010 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/bld.inf	Tue Apr 20 15:36:33 2010 -0500
@@ -2,9 +2,25 @@
 PRJ_PLATFORMS
 WINSCW ARMV5 GCCE
 
+$(undefSBSV2)
+#ifdef SBSV2
+
+PRJ_EXTENSIONS
+	
+	START EXTENSION s60/mifconv
+	OPTION TARGETFILE $(baseName$lower)_aif.mif
+	OPTION HEADERFILE $(baseName$lower)_aif.mbg
+	OPTION SOURCEDIR ../gfx
+	OPTION SOURCES -c32 qgn_menu_$(baseName)
+	END
+
+#else
+
 PRJ_MMPFILES
 
-gnumakefile icons_aif_scalable_dc.mk
+	gnumakefile icons_scalable_dc.mk
 
+#endif
 
+PRJ_MMPFILES
 $(baseName).mmp
FCL/sftools/dev/ide/carbidecpp