--- a/sf_config/rombuild/sf_refhw/bigrom.oby Fri Jun 25 18:03:33 2010 +0100
+++ b/sf_config/rombuild/sf_refhw/bigrom.oby Mon Jun 28 15:15:35 2010 +0100
@@ -59,12 +59,6 @@
//#define __TAGCOLLECTIONPLUGIN_IBY__
//#define __TAGSBROWSERVIEWPLUGIN_IBY__
-
-
-
-#define XMLUICONTROLLERRESOURCES_IBY // ai3xmlui already includes the only resource included by this file
-
-
// these are defined in bldprivate.hrh
#undef __LAYOUT_480_320_TOUCH
#undef __LAYOUT_320_480_TOUCH
@@ -177,6 +171,10 @@
//#undef USE_CUSTOM_MMC_PARTITION // stops base.iby pulling in emmcptn.dll, which is pulled in by base_zoom2.iby
#ifdef ZOOM2
#include <zoom2.oby>
+// default base.iby does not have a #ifdef added to include base_zoom2.iby
+// like so:
+// #elif defined(__MOMAP34XX_ZOOM2__)
+// #include <base_zoom2.iby>
// which includes <header.iby>
// which includes <symbian_os_romdefs.hby>
// which includes <feature.iby>
@@ -239,6 +237,14 @@
#undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build
+#define XMLUIRENDERINGRESOURCES_IBY // resolves xnuiengine.rsc clash
+#define XMLUICONTROLLERRESOURCES_IBY // ai3xmlui already includes the only resource included by this file
+#define __SERVICEWIDGET_20021383_RESOURCES_IBY__ // resolves servicewidget.o0000 clash
+#define __AVKON_RESOURCES_IBY__ // resolves smiley.rsc clash
+data=ZRESOURCE\avkon.rsc RESOURCE_FILES_DIR\avkon.rsc
+#define __DESKTOP_20026F4F_RESOURCES_IBY__ // resolves desktopconfiguration.dtd clash
+#define __EMAILWIDGET_RESOURCES_IBY__ // resolves emailwidgetconfiguration.dtd clash
+#define __MUSICWIDGET_10207c18_RESOURCES_IBY__ // resolves musicwidgetconfiguration.dtd clash
/* The top-level includes */
--- a/sf_config/rombuild/sf_refhw/group/bld.inf Fri Jun 25 18:03:33 2010 +0100
+++ b/sf_config/rombuild/sf_refhw/group/bld.inf Mon Jun 28 15:15:35 2010 +0100
@@ -20,16 +20,19 @@
PRJ_EXPORTS
../bigrom.oby /epoc32/rom/config/sf_refhw/
../image_conf_sf_refhw.mk /epoc32/rom/config/sf_refhw/
-../S60Macros.iby /epoc32/rom/include/
+../S60Macros.iby /epoc32/rom/include/
../S60CenRep_variant.iby /epoc32/rom/include/
../base_syborg_ui.iby /epoc32/rom/include/
-../mytraces.txt /epoc32/rombuild/
+../mytraces.txt /epoc32/rombuild/
-
+/* Zoom 2*/
../zoom2/image_conf_zoom2.mk /epoc32/rom/config/sf_refhw/zoom2/
+/* Syborg */
../syborg/image_conf_syborg.mk /epoc32/rom/config/sf_refhw/syborg/
+../syborg/syborg.dtb /epoc32/rom/config/sf_refhw/syborg/
+/* BeagleBoard */
../beagle/image_conf_beagle.mk /epoc32/rom/config/sf_refhw/beagle/
\ No newline at end of file
Binary file sf_config/rombuild/sf_refhw/syborg/syborg.dtb has changed