From b4a7eadb28a49ace84994dcff665b1cabae69652 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 30 Aug 2010 10:27:12 +0200 Subject: 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 --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1221d62..f564aec 100755 --- a/configure +++ b/configure @@ -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" -- cgit v0.12