diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-08-30 08:27:12 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-30 09:11:16 (GMT) |
| commit | b4a7eadb28a49ace84994dcff665b1cabae69652 (patch) | |
| tree | 9b6e7e3c27994a54342f762ad3046117b8c74fca | |
| parent | 2acd16ec844980efc32937bc0a6a52ef2299c161 (diff) | |
| download | Qt-b4a7eadb28a49ace84994dcff665b1cabae69652.zip Qt-b4a7eadb28a49ace84994dcff665b1cabae69652.tar.gz Qt-b4a7eadb28a49ace84994dcff665b1cabae69652.tar.bz2 | |
fix MinGW cross compilation with -debug-and-release
Fixed two issues in the configure script that prevented
-debug-and-release from working correctly:
We now allow dual debug and release mode for MinGW.
We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives
qmake the freedom to put the debug and release precompiled headers in
separate directories.
Merge-request: 794
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2328,7 +2328,7 @@ fi # detect build style if [ "$CFG_DEBUG" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then CFG_DEBUG_RELEASE=yes CFG_DEBUG=yes elif [ "$CFG_DEV" = "yes" ]; then @@ -6682,7 +6682,11 @@ if [ "$PLATFORM_QWS" = "yes" ]; then QT_CONFIG="$QT_CONFIG embedded" rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes fi -QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" +if [ "$XPLATFORM_MINGW" != "yes" ]; then + # Do not set this here for Windows. Let qmake do it so + # debug and release precompiled headers are kept separate. + QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR" +fi QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR" QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR" QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR" |