# HG changeset patch
# User Gareth Long <garethl@symbian.org>
# Date 1277472639 -3600
# Node ID 27ee1ccf705b0f61f3e46a08385b816f3a0505b0
# Parent  f81fa44d2763556b2293d132a26db4f54bfaa5d4
Enhanced IBY include path handling

diff -r f81fa44d2763 -r 27ee1ccf705b sf_config/rombuild/sf_refhw/bigrom.oby
--- a/sf_config/rombuild/sf_refhw/bigrom.oby	Wed Jun 23 17:11:21 2010 +0100
+++ b/sf_config/rombuild/sf_refhw/bigrom.oby	Fri Jun 25 14:30:39 2010 +0100
@@ -274,7 +274,7 @@
 //                                            which includes <btrace.iby>
 #include <alarmserver.iby>
 //                                            which includes <ssmsus.iby>
-#include <alfred.iby>
+// #include <alfred.iby> /* included by other components */
 #include <amastart.iby>
 #include <animation.iby>
 #include <aplp.iby>
diff -r f81fa44d2763 -r 27ee1ccf705b sf_config/rombuild/sf_refhw/image_conf_sf_refhw.mk
--- a/sf_config/rombuild/sf_refhw/image_conf_sf_refhw.mk	Wed Jun 23 17:11:21 2010 +0100
+++ b/sf_config/rombuild/sf_refhw/image_conf_sf_refhw.mk	Fri Jun 25 14:30:39 2010 +0100
@@ -29,10 +29,14 @@
 USE_VERGEN     = 1
 USE_ROFS       = 0
 
+
 # CORE
 # imaker -f /epoc32/rom/config/platform/product/image_conf_product.mk core
 #
-COREPLAT_OPT = $(BLDROM_OPT) -D_EABI=$(ARM_VERSION)\
+# added includes here to workaround IBYs including others as 'xxx.iby' when it should have been 'core/mw/xxx.iby' etc.
+
+COREPLAT_OPT = $(BLDROM_OPT) -D_EABI=$(ARM_VERSION) \
+  -I$(ITOOL_DIR)/../../rom/include/core/mw -I$(ITOOL_DIR)/../../rom/include/core/app \
   $(if $(PRODUCT_MSTNAME),-D$(call ucase,$(PRODUCT_MSTNAME))) -D$(call ucase,$(PRODUCT_NAME)) $(PRODUCT_OPT)
 
 CORE_OBYGEN =\
@@ -51,6 +55,6 @@
 
 # Workaround to fix Rombuild errors:
 # "ERROR: incorrect format for time keyword..." and "The size of the ROM has not been supplied."
-CORE_OPT += --DROMMEGS=80 --DROMDATE=$(CORE_TIME)
+CORE_OPT += --DROMMEGS=F8 --DROMDATE=$(CORE_TIME)