--- a/syncmlfw/common/debug/bld/nsmldebug.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/debug/bld/nsmldebug.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/http/bld/nsmlhttp.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/http/bld/nsmlhttp.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
TARGETTYPE dll
UID 0x101F6DE4 270495204
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -28,7 +28,7 @@
TARGETTYPE dll
UID 0x101F6DE4 270495204
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/obex/obexcommserver/bld/nsmlobexcommcserver.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/obex/obexcommserver/bld/nsmlobexcommcserver.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
TARGETTYPE dll
UID 0x1000008d 0x101F6DF0
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
// ECom Dll recognition UID followed by the unique UID for this dll
UID 0x10009D8D 0x101F968C
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/obex/obexdsplugin/bld/nsmlobexdsplugin.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/obex/obexdsplugin/bld/nsmlobexdsplugin.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -30,7 +30,7 @@
//MACRO __MDO_ENABLED
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/obex/obexserverbinding/bld/nsmlobexserverbinding.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/obex/obexserverbinding/bld/nsmlobexserverbinding.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
TARGETTYPE dll
UID 0x101F6DE4 270495204
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/transport/bld/nsmltransport.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/transport/bld/nsmltransport.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
TARGETTYPE dll
UID 0x101F6DE4 270495204
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
TARGETTYPE dll
UID 0x1000008d 0x101F6DF0
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/common/xml/bld/nsmlxml.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/common/xml/bld/nsmlxml.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -24,7 +24,7 @@
TARGETTYPE dll
UID 0x1000008d 0x101F6DF0
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/dm/dmutils/bld/nsmldmclientserverutils.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/dmutils/bld/nsmldmclientserverutils.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -25,7 +25,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabidmclientserverutils
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscwdmclientserverutils
--- a/syncmlfw/dm/dmutils/bld/nsmldmiapmatcher.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/dmutils/bld/nsmldmiapmatcher.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabiiapmatcher
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscwiapmatcher
--- a/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/dm/treedbclient/bld/nsmldmtreedbclient.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/treedbclient/bld/nsmldmtreedbclient.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
TARGETTYPE dll
UID 0x1000008d 268437795
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./def/eabi
#elif defined(WINSCW)
DEFFILE ./def/bwinscw
--- a/syncmlfw/dm/treedbhandler/bld/nsmldmtreedbhandler.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/treedbhandler/bld/nsmldmtreedbhandler.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -27,7 +27,7 @@
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/dm/treemodule/bld/nsmldmmodule.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/dm/treemodule/bld/nsmldmmodule.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
TARGETTYPE dll
UID 0x1000008d 268437795
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./DEF/eabi
#elif defined(WINSCW)
DEFFILE ./DEF/bwinscw
--- a/syncmlfw/ds/dsutils/dbcaps/bld/nsmldbcaps.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/ds/dsutils/dbcaps/bld/nsmldbcaps.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -26,7 +26,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./def/eabidbcaps
#elif defined(WINSCW)
DEFFILE ./def/bwinscwdbcaps
--- a/syncmlfw/ds/dsutils/filterutils/bld/nsmlfilter.mmp Tue Jun 15 14:45:44 2010 +0100
+++ b/syncmlfw/ds/dsutils/filterutils/bld/nsmlfilter.mmp Wed Jun 16 13:52:50 2010 +0100
@@ -24,7 +24,7 @@
TARGETTYPE DLL
UID 0x1000008d 0x101F6DE4
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ./def/eabifilter
#elif defined(WINSCW)
DEFFILE ./def/bwinscwfilter