From f247315cece2929d471eebfbd7e40bfb4eca831b Mon Sep 17 00:00:00 2001 From: Iain Date: Wed, 13 Jan 2010 14:15:48 +0000 Subject: Use MMP keyword, not compiler flags, to update FPU option on Symbian This avoids two sets of --fpu flags being passed on the compiler command line, so we don't have to worry about which takes precedence (especially since it varies between RVCT and GCC). Putting ARMFPU in the MMP file means that the toolchain will replace its default option with the one we specify instead. Reviewed-by: Aleksandar Sasha Babic --- configure.exe | Bin 1176576 -> 1176064 bytes tools/configure/configureapp.cpp | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.exe b/configure.exe index a410efc..d88da13 100644 Binary files a/configure.exe and b/configure.exe differ diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0ddb1df..78f65a6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2770,8 +2770,9 @@ void Configure::generateCachefile() if (!dictionary["QT_LIBINFIX"].isEmpty()) configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; + configStream << "#Qt for Symbian FPU settings" << endl; if(!dictionary["ARM_FPU_TYPE"].isEmpty()) { - configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"]; + configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; } configStream.flush(); -- cgit v0.12