Catchup to latest Symbian^4 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Thu, 22 Jul 2010 16:38:01 +0100
branchGCC_SURGE
changeset 39 3d9988ee47f5
parent 32 bf039b7fe409 (diff)
parent 36 aa5a574040a4 (current diff)
child 42 63d7c3197545
Catchup to latest Symbian^4
harvester/blacklistclient/group/blacklistclient.mmp
harvester/client/group/harvesterclient.mmp
harvester/common/group/harvestercommon.mmp
locationmanager/client/group/locationmanagerclient.mmp
locationmanager/locationtrail/group/locationtrail.mmp
--- a/contextengine/group/contextengine.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/group/contextengine.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/blacklistclient/group/blacklistclient.mmp	Thu Jul 22 16:38:01 2010 +0100
@@ -44,7 +44,7 @@
 deffile ../bwincw/blacklistclientwinscw.def
 #else 
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/blacklistclientarm.def
 #endif
 
--- a/harvester/client/group/harvesterclient.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/client/group/harvesterclient.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvestercommon.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvesterdata.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/group/harvesterplugininterface.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/client/group/locationmanagerclient.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/locationtrail/group/locationtrail.mmp	Thu Jul 22 16:38:01 2010 +0100
@@ -29,7 +29,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	Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/client/group/mdeclient.mmp	Thu Jul 22 16:38:01 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	Tue Jul 06 14:44:37 2010 +0300
+++ b/metadataengine/common/group/mdccommon.mmp	Thu Jul 22 16:38:01 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