# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1277471115 -3600
# Node ID ac7f88fb2797022e41c25addfdf986e1603fa053
# Parent  81989c9b11e31364d3f35a72ed416a9b0cc54c35
Select correct DEF file in GCC builds - more stuff for Bug 2956

diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp
--- a/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/common/historylog/bld/nsmlhistorylog.mmp
--- a/syncmlfw/common/historylog/bld/nsmlhistorylog.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/common/historylog/bld/nsmlhistorylog.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp
--- a/syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -21,7 +21,7 @@
 #include "defaultcaps.hrh"
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp
--- a/syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -25,7 +25,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F9A07
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./def/eabidmhostserver
 #elif defined(WINSCW)
 DEFFILE			./def/bwinscwdmhostserver
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/dm/settings/bld/nsmldmsettings.mmp
--- a/syncmlfw/dm/settings/bld/nsmldmsettings.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/dm/settings/bld/nsmldmsettings.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -20,7 +20,7 @@
 #include "defaultcaps.hrh"
 #include  <platform_paths.hrh>
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabidmsettings
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscwdmsettings
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp
--- a/syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -26,7 +26,7 @@
 VENDORID	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp
--- a/syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -27,7 +27,7 @@
 VENDORID	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp
--- a/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -23,7 +23,7 @@
 CAPABILITY    CAP_GENERAL_DLL
 VENDORID      VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabiProfileUtil.def
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwProfileUtil.def
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp
--- a/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -29,7 +29,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x2002DCFF
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidshostserver
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdshostserver
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/settings/bld/nsmldssettings.mmp
--- a/syncmlfw/ds/settings/bld/nsmldssettings.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/settings/bld/nsmldssettings.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -26,7 +26,7 @@
 UID             0x1000008d 0x101F6DE4
 VENDORID	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabidssettings
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscwdssettings
diff -r 81989c9b11e3 -r ac7f88fb2797 syncmlfw/ds/syncagent/bld/nsmldsagent.mmp
--- a/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Wed Jun 16 17:20:35 2010 +0100
+++ b/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Fri Jun 25 14:05:15 2010 +0100
@@ -24,7 +24,7 @@
 TARGETTYPE      dll
 UID             0x101F6DE4 0x101F6DE4
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE			./DEF/bwinscw