--- a/m3g/m3gcore11/group/m3g.mmp	Tue Mar 30 20:28:08 2010 +0100
+++ b/m3g/m3gcore11/group/m3g.mmp	Fri Apr 02 11:19:14 2010 +0100
@@ -26,14 +26,14 @@
 CAPABILITY      CAP_GENERAL_DLL
 
 // Modify default options to optimize for speed over size in this module.
-OPTION ARMCC -O3
-OPTION ARMCC -Otime
+OPTION ARMCC -O3 -Otime
 ALWAYS_BUILD_AS_ARM
 
 // Uncomment the following flags to enable ARMv6 and/or VFP optimizations.
-//#define __ARMV6_SUPPORT
-//#define __VFPV2_SUPPORT
+#define __ARMV6_SUPPORT
+#define __VFPV2_SUPPORT
 
+#ifdef ARMCC
 #ifdef __ARMV6_SUPPORT
 MACRO			M3G_HW_ARMV6
 OPTION_REPLACE ARMCC --cpu 6
@@ -44,6 +44,7 @@
 MACRO			M3G_HW_FLOAT_VFPV2
 OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast
 #endif
+#endif
 
 
 #if defined(UDEB)
@@ -69,3 +70,5 @@
 LIBRARY         euser.lib estlib.lib fbscli.lib
 LIBRARY         efsrv.lib ws32.lib
 LIBRARY         libGLESv1_CM.lib ezlib.lib libEGL.lib
+
+SMPSAFE