--- a/messagingappbase/msgmedia/group/MsgMedia.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/messagingappbase/msgmedia/group/MsgMedia.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -79,7 +79,7 @@
LIBRARY msgcommonutils.lib
STATICLIBRARY hxmetadatautil.lib
-#if defined( ARMCC )
+#if defined( EABI )
deffile ./eabi.def
#elif defined( WINS )
deffile ./wins.DEF
--- a/mmsengine/applicationadapter/bld/mmsapplicationadapter.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/applicationadapter/bld/mmsapplicationadapter.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -49,7 +49,7 @@
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmsapplicationadapter.def
//#elif defined( WINSCW )
//deffile ../bwinscw/mmsapplicationadapter.def
--- a/mmsengine/clientmtm/bld/mmsclient.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/clientmtm/bld/mmsclient.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -58,7 +58,7 @@
// remove comments from this macro if no logging wanted
MACRO _NO_MMSC_LOGGING_
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmscli.def
//#elif defined( WINSCW )
//deffile ../bwinscw/mmscli.def
--- a/mmsengine/genutils/bld/mmsgenutils.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/genutils/bld/mmsgenutils.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -54,7 +54,7 @@
//LIBRARY Pbk2Presentation.lib
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmsgenutils.def
#elif defined( WINS )
DEFFILE ../bwins/wins.def
--- a/mmsengine/mmscodec/bld/mmscodec.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmscodec/bld/mmscodec.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -80,7 +80,7 @@
DEBUGLIBRARY flogger.lib
#endif
-#if defined( ARMCC )
+#if defined( EABI )
deffile ../eabi/mmscodec.def
//#elif defined( WINSCW )
//deffile ../bwinscw/mmscodec.def
--- a/mmsengine/mmscodecclient/bld/mmscodecclient.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmscodecclient/bld/mmscodecclient.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -50,7 +50,7 @@
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmscodecclient.def
//#elif defined( WINSCW )
//deffile ../bwinscw/mmscodecclient.def
--- a/mmsengine/mmshttptransport/bld/mmstransport.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmshttptransport/bld/mmstransport.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -73,7 +73,7 @@
DEBUGLIBRARY flogger.lib
#endif
-#if defined( ARMCC )
+#if defined( EABI )
deffile ../eabi/mmstransport.def
#elif defined( WINSCW )
deffile ../bwinscw/mmstransport.def
--- a/mmsengine/mmsmessage/bld/mmsmessage.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmsmessage/bld/mmsmessage.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -71,7 +71,7 @@
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmsmessage.def
#elif defined( WINS )
DEFFILE ../bwins/wins.def
--- a/mmsengine/mmsserver/bld/mmsserver.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmsserver/bld/mmsserver.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -94,7 +94,7 @@
DEBUGLIBRARY flogger.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/mmsserver.def
#elif defined( WINS )
DEFFILE ../bwins/mmsserver.def
--- a/mmsengine/mmsserversettings/bld/mmsserversettings.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmsserversettings/bld/mmsserversettings.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -50,7 +50,7 @@
LIBRARY mmsconninit.lib
LIBRARY bafl.lib
-#if defined( ARMCC )
+#if defined( EABI )
deffile ../eabi/mmsserversettings.def
#elif defined( WINSCW )
deffile ../bwinscw/mmsserversettings.def
--- a/mmsengine/mmswatcher/bld/mmswatcher.mmp Fri Jun 11 16:24:01 2010 +0100
+++ b/mmsengine/mmswatcher/bld/mmswatcher.mmp Thu Jun 17 09:57:06 2010 +0100
@@ -77,7 +77,7 @@
DEBUGLIBRARY flogger.lib
#endif
-/*#if defined(ARMCC)
+/*#if defined(EABI)
deffile ../eabi/mmswatcher.def
#elif defined( WINSCW )
deffile ../bwinscw/mmswatcher.def