# HG changeset patch
# User Christian Morlok <symbian.org@christianmorlok.de>
# Date 1269648002 -3600
# Node ID 3310c3399a08b0127b2f51f5e6051cd6edb88abf
# Parent  9d28e9ec8f22999d3c6390160814dbe2aa25c0e2
add new mifconv

diff -r 9d28e9ec8f22 -r 3310c3399a08 dependencies/bld.inf
--- a/dependencies/bld.inf	Sat Mar 27 00:39:17 2010 +0100
+++ b/dependencies/bld.inf	Sat Mar 27 01:00:02 2010 +0100
@@ -103,7 +103,5 @@
 #include "transition_effect_utility/bld.inf"
 #include "ssm/bld.inf"
 #include "swi/bld.inf"
-
+#include "mifconv/group/bld.inf"
 
-
-
diff -r 9d28e9ec8f22 -r 3310c3399a08 dependencies/mifconv/group/bld.inf
--- a/dependencies/mifconv/group/bld.inf	Sat Mar 27 00:39:17 2010 +0100
+++ b/dependencies/mifconv/group/bld.inf	Sat Mar 27 01:00:02 2010 +0100
@@ -16,21 +16,7 @@
 */
 
 
-PRJ_PLATFORMS
-#ifdef SBSV2
-  TOOLS2
-#else
-  TOOLS
-#endif
-
-
-PRJ_MMPFILES
-#if defined(TOOLS) || defined(TOOLS2)
-  mifconv.mmp
-#endif
-
 PRJ_EXPORTS
-#ifdef SBSV2
   ../makefile_templates/mifconv_global_options.make           +/tools/makefile_templates/s60/mifconv_global_options.make
   ../makefile_templates/mifconv_option_reader_recursive.make  +/tools/makefile_templates/s60/mifconv_option_reader_recursive.make
   ../makefile_templates/mifconv_option_reader.make            +/tools/makefile_templates/s60/mifconv_option_reader.make
@@ -42,5 +28,5 @@
   ../makefile_templates/mifconv.meta                          +/tools/makefile_templates/s60/mifconv.meta
   ../makefile_templates/mifconv.mk                            +/tools/makefile_templates/s60/mifconv.mk
   ../makefile_templates/mifconv.xml                           +/tools/makefile_templates/s60/mifconv.xml
-#endif
+  mifconv-s3.exe		+/tools/mifconv-s3.exe
 
diff -r 9d28e9ec8f22 -r 3310c3399a08 dependencies/mifconv/group/mifconv-s3.exe
Binary file dependencies/mifconv/group/mifconv-s3.exe has changed
diff -r 9d28e9ec8f22 -r 3310c3399a08 dependencies/mifconv/makefile_templates/mifconv_global_options.make
--- a/dependencies/mifconv/makefile_templates/mifconv_global_options.make	Sat Mar 27 00:39:17 2010 +0100
+++ b/dependencies/mifconv/makefile_templates/mifconv_global_options.make	Sat Mar 27 01:00:02 2010 +0100
@@ -36,7 +36,7 @@
 		
 # Binary conversion tools:
 SVGTBINENCODE:=$(EPOCROOT)epoc32$/tools$/svgtbinencode
-MIFCONV:=$(EPOCROOT)epoc32$/tools$/mifconv
+MIFCONV:=$(EPOCROOT)epoc32$/tools$/mifconv-s3
 
 # SVG and BMP icon bitmap searching directories, depends on a platform:
 VECTORSOURCEDIR:=$(EPOCROOT)epoc32$/s60$/icons