--- a/skins/AknSkins/group/AknSkinSrv.mmp	Tue Aug 31 16:13:36 2010 +0300
+++ b/skins/AknSkins/group/AknSkinSrv.mmp	Wed Sep 01 12:19:53 2010 +0100
@@ -26,7 +26,7 @@
 VENDORID        VID_DEFAULT
 
 #ifdef __VFP_HW_SUPPORT
-OPTION ARMCC --fpu vfpv2 --fpmode fast
+ARMFPU vfpv2
 #endif
 
 USERINCLUDE     . ../srvinc 
@@ -45,11 +45,11 @@
 LIBRARY         bafl.lib
 LIBRARY         efsrv.lib
 LIBRARY         fbscli.lib 
-LIBRARY         drmhelper.lib
-LIBRARY         ImageConversion.lib
-LIBRARY         BitmapTransforms.lib
+LIBRARY         DrmHelper.lib
+LIBRARY         imageconversion.lib
+LIBRARY         bitmaptransforms.lib
 LIBRARY         bitgdi.lib
-LIBRARY         SvgEngine.lib
+LIBRARY         svgengine.lib
 LIBRARY         gdi.lib
 LIBRARY         hal.lib
 
@@ -58,8 +58,8 @@
 LIBRARY         caf.lib
 LIBRARY         cafutils.lib
 
-LIBRARY         CentralRepository.lib
-LIBRARY         CenRepNotifHandler.lib
+LIBRARY         centralrepository.lib
+LIBRARY         cenrepnotifhandler.lib
 
 LIBRARY         xmlframework.lib
 LIBRARY         ws32.lib
@@ -67,14 +67,14 @@
 
 LIBRARY         abclient.lib 
 LIBRARY         sbeclient.lib
-LIBRARY         PlatformEnv.lib
+LIBRARY         platformenv.lib
 LIBRARY         disknotifyhandler.lib
 LIBRARY         platformver.lib
 
 LIBRARY         apgrfx.lib
 LIBRARY         IclExtJpegApi.lib
 LIBRARY         avkon.lib
-LIBRARY         AknIcon.lib
+LIBRARY         aknicon.lib
 
 SOURCEPATH      ../srvsrc
 SOURCE          AknsSrvClient.cpp
@@ -108,7 +108,7 @@
 // Target-specific DEF files
 // ============================================================================
 
-#if defined(EABI)
+#if defined(ARMCC)
 deffile ../EABI/ 
 #elif defined(WINSCW)
 deffile ../BWINSCW/