# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1277470191 -3600
# Node ID 4d2d69762e13ffc20916a58097dcf97271c82cb9
# Parent  ad9262cb9cb7db64eea7617abc0f05c7df6d3b79
Select correct DEF file in GCC builds - Bug 3015

diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -71,7 +71,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp
--- a/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp
--- a/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -73,7 +73,7 @@
 //EXPORTUNFROZEN
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -63,7 +63,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -67,7 +67,7 @@
 LIBRARY         		flogger.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -74,7 +74,7 @@
 LIBRARY                 flogger.lib 
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -64,7 +64,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 ximpfw/presence/group/presencecacheclient.mmp
--- a/ximpfw/presence/group/presencecacheclient.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/ximpfw/presence/group/presencecacheclient.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpdatamodel.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 ximpfw/presence/group/presencecacheecomhook.mmp
--- a/ximpfw/presence/group/presencecacheecomhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/ximpfw/presence/group/presencecacheecomhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -50,7 +50,7 @@
 LIBRARY                 presencecacheclient.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 ximpfw/presence/group/presencedatamodelhook.mmp
--- a/ximpfw/presence/group/presencedatamodelhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/ximpfw/presence/group/presencedatamodelhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 ximpfw/presence/group/presenceecomhook.mmp
--- a/ximpfw/presence/group/presenceecomhook.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/ximpfw/presence/group/presenceecomhook.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencemanager.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r ad9262cb9cb7 -r 4d2d69762e13 ximpfw/presence/group/presencemanager.mmp
--- a/ximpfw/presence/group/presencemanager.mmp	Mon Jun 21 22:35:24 2010 +0100
+++ b/ximpfw/presence/group/presencemanager.mmp	Fri Jun 25 13:49:51 2010 +0100
@@ -66,7 +66,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpsrvclient.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/