--- a/apengine/apeng/group/APEngine.MMP Tue Jun 15 14:09:51 2010 +0100
+++ b/apengine/apeng/group/APEngine.MMP Wed Jun 16 14:56:42 2010 +0100
@@ -73,7 +73,7 @@
LIBRARY Vpnapi.lib
LIBRARY centralrepository.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/ApEngine_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/ApEngine_EKA2.def
--- a/apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -93,7 +93,7 @@
LIBRARY centralrepository.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/ApSettingsHandlerUI_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/ApSettingsHandlerUI_EKA2.def
--- a/cmmanager/cmmgr/cmmapi/group/cmmapi.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/cmmapi/group/cmmapi.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -58,7 +58,7 @@
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/CmManager_prot_setup.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/CmManager_prot_setup.def
--- a/cmmanager/cmmgr/cmmpluginbase/group/cmmpluginbase.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/cmmpluginbase/group/cmmpluginbase.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -53,7 +53,7 @@
LIBRARY efsrv.lib
LIBRARY hbcore.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/cmmpluginbase.def
#else
DEFFILE ../BWinsCw/cmmpluginbase.def
--- a/cmmanager/cmmgr/database/group/cmmanagerdatabase.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/database/group/cmmanagerdatabase.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -47,7 +47,7 @@
//LIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/cmmanagerdatabase.def
#elif defined( WINSCW )
DEFFILE ../bwinscw/cmmanagerdatabase.def
--- a/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -78,7 +78,7 @@
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/ConnMon_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWINSCW/CONNMON_EKA2.def
--- a/connectionmonitoring/connmonext/group/ConnMonExt.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionmonitoring/connmonext/group/ConnMonExt.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -36,7 +36,7 @@
LIBRARY connmon.lib
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../EABI/ConnMonExt_EKA2.def
#elif defined( WINSCW )
DEFFILE ../BWinsCw/CONNMONEXT_EKA2.def
--- a/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -114,7 +114,7 @@
LIBRARY HbCore.lib
LIBRARY HbWidgets.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../ConnectionUiUtilities/EABI/ConnUiUtilsNotif.DEF
#elif defined( WINSCW )
DEFFILE ../ConnectionUiUtilities/BWinsCw/ConnUiUtilsNotif.DEF
--- a/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -82,7 +82,7 @@
DEBUGLIBRARY flogger.lib
-#if defined( ARMCC )
+#if defined( EABI )
DEFFILE ../ConnectionUiUtilities/EABI/ConnectionUiUtilities_PROT.def
--- a/connectionutilities/ConnectionDialogs/group/DisconnectDlg.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/DisconnectDlg.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -87,7 +87,7 @@
DEBUGLIBRARY efsrv.lib
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../DisconnectDlg/EABI/DisconnectDlg.DEF
#elif defined( WINSCW )
DEFFILE ../DisconnectDlg/BWinsCw/DISCONNECTDLG.def
--- a/connectionutilities/ConnectionDialogs/group/DisconnectDlgClient.mmp Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/DisconnectDlgClient.mmp Wed Jun 16 14:56:42 2010 +0100
@@ -50,7 +50,7 @@
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../DisconnectDlg/EABI/DISCONNECTDLGCLIENT.def
#elif defined( WINSCW )
DEFFILE ../DisconnectDlg/BWinsCw/DISCONNECTDLGCLIENT.def