--- a/browserutilities/browsertelservice/group/BrowserTelService.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/browsertelservice/group/BrowserTelService.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -96,7 +96,7 @@
LIBRARY estor.lib // RWriteStream, RFileBuf
LIBRARY Centralrepository.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/BROWSERTELSERVICEU_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/BROWSERTELSERVICEU_EKA2.def
--- a/browserutilities/connectionmanager/Group/ConnectionManager.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/connectionmanager/Group/ConnectionManager.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -79,7 +79,7 @@
LIBRARY cmmanager.lib
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/CONNECTIONMANAGERU_EKA2.def
#else
DEFFILE ../BWinsCw/CONNECTIONMANAGERU_EKA2.def
--- a/browserutilities/cxmllibrary/group/cXmlParser.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/cxmllibrary/group/cXmlParser.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -20,10 +20,9 @@
TARGET cXmlParser.dll
TARGETTYPE dll
-
+UID 0x1000008D 0x101F8710
-#if defined(ARMCC)
-UID 0x1000008D 0x101F8710
+#if defined(EABI)
deffile eabi/CXMLPARSER.DEF
#elif defined( WINSCW )
deffile BWINSCW/CXMLPARSER.DEF
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -27,7 +27,7 @@
//MACRO _DEBUG
//#define _DEBUG
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/DOWNLOADMGRU_EKA2.def
#else
DEFFILE ../BWinsCw/DOWNLOADMGRU_EKA2.def
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -31,7 +31,7 @@
//MACRO _DEBUG
//#define _DEBUG
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/HTTPDMSERVENGU_EKA2.def
#else
DEFFILE ../BWinsCw/HTTPDMSERVENGU_EKA2.def
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -43,7 +43,7 @@
END // RESOURCE
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/DOWNLOADMGRUILIBU_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/DOWNLOADMGRUILIBU_EKA2.def
--- a/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile Bwinscw/FeedsServerApi.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile EABI/FeedsServerApi.def
#endif
--- a/browserutilities/feedsengine/group/FeedsServerClient.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/feedsengine/group/FeedsServerClient.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile Bwinscw/FeedsServerClient.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile EABI/FeedsServerClient.def
#endif
--- a/browserutilities/multipartparser/group/MultipartParser.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/multipartparser/group/MultipartParser.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -27,7 +27,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
deffile EABI/MULTIPARTPARSER.DEF
#elif defined( WINSCW )
deffile Bwinscw/MULTIPARTPARSER.DEF
--- a/browserutilities/recenturlstore/group/RecentUrlStore.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/recenturlstore/group/RecentUrlStore.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -26,7 +26,7 @@
CAPABILITY CAP_GENERAL_DLL
EPOCALLOWDLLDATA
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/RecentUrlStore.def
#elif defined( WINSCW )
DEFFILE ../BWINSCW/RecentUrlStore.def
--- a/browserutilities/xmlparser/group/XMLInterface.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/browserutilities/xmlparser/group/XMLInterface.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -25,7 +25,7 @@
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/xmlinterface.def
#elif defined(WINSCW)
DEFFILE ../bwinscw/xmlinterface.def
--- a/webengine/device/group/Device.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/device/group/Device.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -45,7 +45,7 @@
#if defined(WINSCW)
deffile ../BWINSCW/Device.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../EABI/Device.def
#endif
--- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -35,12 +35,12 @@
EPOCHEAPSIZE 0x5000 0x1000000
#if defined(__S60_32__)
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/JavaScriptCore_3_2.def
#elif defined( WINSCW )
deffile ../Bwinscw/JavaScriptCore_3_2.def
#endif
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/JavaScriptCore.def
#elif defined( WINSCW )
deffile ../bwinscw/JavaScriptCore.def
--- a/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -28,7 +28,7 @@
#if defined(WINSCW)
deffile ../bwinscw/browserengine.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/browserengine.def
#endif
--- a/webengine/osswebengine/cache/group/BrowserCache.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/osswebengine/cache/group/BrowserCache.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -33,7 +33,7 @@
#if defined(WINSCW)
deffile Bwinscw/BrowserCache.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile EABI/BrowserCache.def
#endif
--- a/webengine/osswebengine/npscript/group/npscript.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/osswebengine/npscript/group/npscript.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -30,7 +30,7 @@
#if defined(WINSCW)
deffile Bwinscw/npscript.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile EABI/npscript.def
#endif
--- a/webengine/webkitutils/group/WebKitUtils.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/webkitutils/group/WebKitUtils.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -35,7 +35,7 @@
#if defined(WINSCW)
deffile Bwinscw/WebKitUtils.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile EABI/WebKitUtils.def
#endif
--- a/webengine/widgetengine/group/WidgetEngine.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/widgetengine/group/WidgetEngine.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -85,7 +85,7 @@
#if defined(WINSCW)
deffile ../BWINSCW/WidgetEngine.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../EABI/WidgetEngine.def
#endif
--- a/webengine/widgetregistry/group/WidgetRegistryClient.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/widgetregistry/group/WidgetRegistryClient.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -31,7 +31,7 @@
#if defined(WINSCW)
deffile ../BWINSCW/WidgetRegistryClient.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../EABI/WidgetRegistryClient.def
#endif
--- a/webengine/wmlengine/group/wmlengine/wmlengine.mmp Wed Jun 16 16:52:45 2010 +0100
+++ b/webengine/wmlengine/group/wmlengine/wmlengine.mmp Thu Jun 17 12:25:04 2010 +0100
@@ -33,7 +33,7 @@
#if defined(WINSCW)
deffile ../BWINSCW/WmlEngine.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../EABI/WmlEngine.def
#endif