# HG changeset patch # User William Roberts # Date 1277470590 -3600 # Node ID bf039b7fe409d9e1e747dd3979168436f161576e # Parent 9a8fddcc28b0388f9140f4137d64996ddafc0494 Select correct DEF files in GCC builds - Bug 3106 diff -r 9a8fddcc28b0 -r bf039b7fe409 contextengine/group/contextengine.mmp --- a/contextengine/group/contextengine.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/contextengine/group/contextengine.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp --- a/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/contextengine/plugins/contextplugininterface/group/contextplugininterface.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/blacklistclient/group/blacklistclient.mmp --- a/harvester/blacklistclient/group/blacklistclient.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/blacklistclient/group/blacklistclient.mmp Fri Jun 25 13:56:30 2010 +0100 @@ -43,7 +43,7 @@ deffile ../bwincw/blacklistclientwinscw.def #else -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/blacklistclientarm.def #endif diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/client/group/harvesterclient.mmp --- a/harvester/client/group/harvesterclient.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/client/group/harvesterclient.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/common/group/harvestercommon.mmp --- a/harvester/common/group/harvestercommon.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/common/group/harvestercommon.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/common/group/harvesterdata.mmp --- a/harvester/common/group/harvesterdata.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/common/group/harvesterdata.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/common/group/harvesterplugininterface.mmp --- a/harvester/common/group/harvesterplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/common/group/harvesterplugininterface.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp --- a/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/composerplugins/composerplugininterface/group/composerplugininterface.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp --- a/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/harvester/monitorplugins/monitorplugininterface/group/monitorplugininterface.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 locationmanager/client/group/locationmanagerclient.mmp --- a/locationmanager/client/group/locationmanagerclient.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/locationmanager/client/group/locationmanagerclient.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 locationmanager/locationtrail/group/locationtrail.mmp --- a/locationmanager/locationtrail/group/locationtrail.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/locationmanager/locationtrail/group/locationtrail.mmp Fri Jun 25 13:56:30 2010 +0100 @@ -28,7 +28,7 @@ #if defined(WINSCW) deffile ../bwincw/locationtrailwinscw.def -#elif defined(ARMCC) +#elif defined(EABI) deffile ../eabi/locationtrailarm.def #endif nostrictdef diff -r 9a8fddcc28b0 -r bf039b7fe409 metadataengine/client/group/mdeclient.mmp --- a/metadataengine/client/group/mdeclient.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/metadataengine/client/group/mdeclient.mmp Fri Jun 25 13:56:30 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 diff -r 9a8fddcc28b0 -r bf039b7fe409 metadataengine/common/group/mdccommon.mmp --- a/metadataengine/common/group/mdccommon.mmp Fri Jun 11 16:25:25 2010 +0100 +++ b/metadataengine/common/group/mdccommon.mmp Fri Jun 25 13:56:30 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