--- a/contextengine/group/contextengine.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/contextengine/group/contextengine.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -47,7 +47,7 @@
#if defined(WINS)
deffile ../bwincw/contextenginewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/contextenginearm.def
#endif
nostrictdef
--- a/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -39,7 +39,7 @@
#if defined(WINS)
deffile ../bwincw/contextplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/contextplugininterfacearm.def
#endif
nostrictdef
--- a/harvester/blacklistclient/group/blacklistclient.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/blacklistclient/group/blacklistclient.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -43,7 +43,7 @@
deffile ../bwincw/blacklistclientwinscw.def
#else
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/blacklistclientarm.def
#endif
--- a/harvester/client/group/harvesterclient.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/client/group/harvesterclient.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile ../bwincw/harvesterclientwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/harvesterclientarm.def
#endif
nostrictdef
--- a/harvester/common/group/harvestercommon.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/common/group/harvestercommon.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile ../bwincw/harvestercommonwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/harvestercommonarm.def
#endif
nostrictdef
--- a/harvester/common/group/harvesterdata.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/common/group/harvesterdata.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile ../bwincw/harvesterdatawinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/harvesterdataarm.def
#endif
nostrictdef
--- a/harvester/common/group/harvesterplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/common/group/harvesterplugininterface.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -46,7 +46,7 @@
#if defined(WINS)
deffile ../bwincw/harvesterplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/harvesterplugininterfacearm.def
#endif
nostrictdef
--- a/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -39,7 +39,7 @@
#if defined(WINS)
deffile ../bwincw/composerplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/composerplugininterfacearm.def
#endif
nostrictdef
--- a/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -43,7 +43,7 @@
#if defined(WINS)
deffile ../bwincw/monitorplugininterfacewinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/monitorplugininterfacearm.def
#endif
nostrictdef
--- a/locationmanager/client/group/locationmanagerclient.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/locationmanager/client/group/locationmanagerclient.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -20,7 +20,7 @@
#if defined(WINSCW)
deffile ../bwincw/locationmanagerclientwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/locationmanagerclientarm.def
#endif
nostrictdef
--- a/locationmanager/locationtrail/group/locationtrail.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/locationmanager/locationtrail/group/locationtrail.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -28,7 +28,7 @@
#if defined(WINSCW)
deffile ../bwincw/locationtrailwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/locationtrailarm.def
#endif
nostrictdef
--- a/metadataengine/client/group/mdeclient.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/metadataengine/client/group/mdeclient.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -32,7 +32,7 @@
#if defined(WINSCW)
deffile ../bwincw/mdeclientu.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/mdeclientu.def
#endif
nostrictdef
--- a/metadataengine/common/group/mdccommon.mmp Fri Jun 11 16:25:25 2010 +0100
+++ b/metadataengine/common/group/mdccommon.mmp Fri Jun 25 13:56:30 2010 +0100
@@ -29,7 +29,7 @@
#if defined(WINSCW)
deffile ../bwincw/mdccommonu.def
-#elif defined(ARMCC)
+#elif defined(EABI)
deffile ../eabi/mdccommonu.def
#endif
nostrictdef