equal
deleted
inserted
replaced
57 //#define CAMERAAPP_IBY |
57 //#define CAMERAAPP_IBY |
58 //#define SHW_IBY |
58 //#define SHW_IBY |
59 //#define __TAGCOLLECTIONPLUGIN_IBY__ |
59 //#define __TAGCOLLECTIONPLUGIN_IBY__ |
60 //#define __TAGSBROWSERVIEWPLUGIN_IBY__ |
60 //#define __TAGSBROWSERVIEWPLUGIN_IBY__ |
61 |
61 |
62 |
|
63 |
|
64 |
|
65 #define XMLUICONTROLLERRESOURCES_IBY // ai3xmlui already includes the only resource included by this file |
|
66 |
|
67 |
|
68 // these are defined in bldprivate.hrh |
62 // these are defined in bldprivate.hrh |
69 #undef __LAYOUT_480_320_TOUCH |
63 #undef __LAYOUT_480_320_TOUCH |
70 #undef __LAYOUT_320_480_TOUCH |
64 #undef __LAYOUT_320_480_TOUCH |
71 |
65 |
72 // these are defined in bldpublic.hrh |
66 // these are defined in bldpublic.hrh |
175 #include "s60macros.iby" |
169 #include "s60macros.iby" |
176 |
170 |
177 //#undef USE_CUSTOM_MMC_PARTITION // stops base.iby pulling in emmcptn.dll, which is pulled in by base_zoom2.iby |
171 //#undef USE_CUSTOM_MMC_PARTITION // stops base.iby pulling in emmcptn.dll, which is pulled in by base_zoom2.iby |
178 #ifdef ZOOM2 |
172 #ifdef ZOOM2 |
179 #include <zoom2.oby> |
173 #include <zoom2.oby> |
|
174 // default base.iby does not have a #ifdef added to include base_zoom2.iby |
|
175 // like so: |
|
176 // #elif defined(__MOMAP34XX_ZOOM2__) |
|
177 // #include <base_zoom2.iby> |
180 // which includes <header.iby> |
178 // which includes <header.iby> |
181 // which includes <symbian_os_romdefs.hby> |
179 // which includes <symbian_os_romdefs.hby> |
182 // which includes <feature.iby> |
180 // which includes <feature.iby> |
183 // which includes <base.iby> |
181 // which includes <base.iby> |
184 // which includes <kernel.hby> |
182 // which includes <kernel.hby> |
237 |
235 |
238 |
236 |
239 |
237 |
240 #undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build |
238 #undef FF_WLAN_WAPI_INCLUDE_IN_ROM // needed so that wapisecuritysettingsui.iby pulls in a wapuisecuritysettingsui.dll that we have in the build |
241 |
239 |
|
240 #define XMLUIRENDERINGRESOURCES_IBY // resolves xnuiengine.rsc clash |
|
241 #define XMLUICONTROLLERRESOURCES_IBY // ai3xmlui already includes the only resource included by this file |
|
242 #define __SERVICEWIDGET_20021383_RESOURCES_IBY__ // resolves servicewidget.o0000 clash |
|
243 #define __AVKON_RESOURCES_IBY__ // resolves smiley.rsc clash |
|
244 data=ZRESOURCE\avkon.rsc RESOURCE_FILES_DIR\avkon.rsc |
|
245 #define __DESKTOP_20026F4F_RESOURCES_IBY__ // resolves desktopconfiguration.dtd clash |
|
246 #define __EMAILWIDGET_RESOURCES_IBY__ // resolves emailwidgetconfiguration.dtd clash |
|
247 #define __MUSICWIDGET_10207c18_RESOURCES_IBY__ // resolves musicwidgetconfiguration.dtd clash |
242 |
248 |
243 |
249 |
244 /* The top-level includes */ |
250 /* The top-level includes */ |
245 |
251 |
246 |
252 |