From 48f18622b6fbfd19ccc77574d3750a8c0c1f6a7d Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Fri, 8 Oct 2010 16:59:44 +0100
Subject: Spectrum demo: put binaries into correct locations on Windows

Task-number: QTBUG-13483
Reviewed-by: Miikka Heikkinen
---
 demos/spectrum/3rdparty/fftreal/fftreal.pro |  2 +-
 demos/spectrum/app/app.pro                  |  9 ++-------
 demos/spectrum/spectrum.pri                 | 12 ++++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index 6305af4..e5093ba 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -40,7 +40,7 @@ symbian {
 macx {
     CONFIG += lib_bundle
 } else {
-    !symbian: DESTDIR = ../..
+    !symbian: DESTDIR = ../..$${spectrum_build_dir}
 }
 
 # Install
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 4fe8b6d..57be114 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -65,7 +65,7 @@ symbian {
             LIBS += -F$${fftreal_dir}
             LIBS += -framework fftreal
         } else {
-            LIBS += -L..
+            LIBS += -L..$${spectrum_build_dir}
             LIBS += -lfftreal
         }
     }
@@ -91,10 +91,8 @@ symbian {
         DEPLOYMENT += fftreal
     }
 } else {
+	DESTDIR = ..$${spectrum_build_dir}
     macx {
-        # Specify directory in which to create spectrum.app bundle
-        DESTDIR = ..
-
         !contains(DEFINES, DISABLE_FFT) {
             # Relocate fftreal.framework into spectrum.app bundle
             framework_dir = ../spectrum.app/Contents/Frameworks
@@ -110,9 +108,6 @@ symbian {
                                   ../spectrum.app/Contents/MacOS/spectrum
         }
     } else {
-        # Specify directory in which to create spectrum application
-        DESTDIR = ..
-
         unix: {
             # Provide relative path from application to fftreal library
             QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
diff --git a/demos/spectrum/spectrum.pri b/demos/spectrum/spectrum.pri
index c09aa0d..5773900 100644
--- a/demos/spectrum/spectrum.pri
+++ b/demos/spectrum/spectrum.pri
@@ -35,3 +35,15 @@ DEFINES += SPECTRUM_ANALYSER_SEPARATE_THREAD
 # Suppress warnings about strncpy potentially being unsafe, emitted by MSVC
 win32: DEFINES += _CRT_SECURE_NO_WARNINGS
 
+win32 {
+    # spectrum_build_dir is defined with a leading slash so that it can
+    # be used in contexts such as
+    #     ..$${spectrum_build_dir}
+    # without the result having a trailing slash where spectrum_build_dir
+    # is undefined.
+    spectrum_build_dir = /release
+    if (!debug_and_release|build_pass): CONFIG(debug, debug|release) {
+        spectrum_build_dir = /debug
+    }
+}
+
-- 
cgit v0.12