3rdparty: don't set custom build directories, aside from the two CELT versions

9 files changed, 13 insertions, 77 deletions

diff --git a/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
index 20cca5fb7..002cc290d 100644
--- a/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
+++ b/3rdparty/celt-0.11.0-build/celt-0.11.0-build.pro
@@ -64,13 +64,11 @@ unix {
 
 SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c laplace.c mathops.c mdct.c modes.c pitch.c plc.c quant_bands.c rate.c vq.c
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
+# TARGET is the same in both versions of CELT, thus we have to specify
+# a separated folder to prevent objects collision between the two.
+OBJECTS_DIR = $$OBJECTS_ROOT/celt-0.11.0-build
+MOC_DIR = $$MOC_ROOT/celt-0.11.0-build
+RCC_DIR = $$RCC_ROOT/celt-0.11.0-build
+UI_DIR = $$UI_ROOT/celt-0.11.0-build
 
 include(../../qmake/symbols.pri)
diff --git a/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro b/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
index 3f010f816..e36dd8971 100644
--- a/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
+++ b/3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro
@@ -71,13 +71,11 @@ unix {
 
 SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c kiss_fftr.c laplace.c mdct.c modes.c pitch.c psy.c quant_bands.c rangedec.c rangeenc.c rate.c vq.c
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
+# TARGET is the same in both versions of CELT, thus we have to specify
+# a separated folder to prevent objects collision between the two.
+OBJECTS_DIR = $$OBJECTS_ROOT/celt-0.7.0-build
+MOC_DIR = $$MOC_ROOT/celt-0.7.0-build
+RCC_DIR = $$RCC_ROOT/celt-0.7.0-build
+UI_DIR = $$UI_ROOT/celt-0.7.0-build
 
 include(../../qmake/symbols.pri)
diff --git a/3rdparty/mach-override-build/mach-override-build.pro b/3rdparty/mach-override-build/mach-override-build.pro
index f0c031741..95edf66f9 100644
--- a/3rdparty/mach-override-build/mach-override-build.pro
+++ b/3rdparty/mach-override-build/mach-override-build.pro
@@ -8,15 +8,6 @@ SOURCEDIR=$$replace(BUILDDIR,-build,-src)
   error("Aborting configuration")
 }
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 TEMPLATE = lib
 CONFIG -= qt
 CONFIG += debug_and_release
diff --git a/3rdparty/minhook-build/minhook-build.pro b/3rdparty/minhook-build/minhook-build.pro
index 06b851e61..1aada668c 100644
--- a/3rdparty/minhook-build/minhook-build.pro
+++ b/3rdparty/minhook-build/minhook-build.pro
@@ -9,15 +9,6 @@ SOURCEDIR=$$replace(BUILDDIR,-build,-src)
   error("Aborting configuration")

 }

 

-CONFIG(debug, debug|release) {

-  CONFIG += console

-  DESTDIR = ../../debug

-}

-

-CONFIG(release, debug|release) {

-  DESTDIR = ../../release

-}

-

 TEMPLATE = lib

 CONFIG -= qt

 CONFIG += debug_and_release

diff --git a/3rdparty/opus-build/opus-build.pro b/3rdparty/opus-build/opus-build.pro
index 6a9d215e2..61047e4f3 100644
--- a/3rdparty/opus-build/opus-build.pro
+++ b/3rdparty/opus-build/opus-build.pro
@@ -259,14 +259,4 @@ src/analysis.c \
 src/mlp.c \
 src/mlp_data.c
 
-
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 include(../../qmake/symbols.pri)
diff --git a/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro b/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
index 1822df352..3fa7b88f0 100644
--- a/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
+++ b/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro
@@ -1,4 +1,4 @@
-include (../../qmake/compiler.pri)
+include(../../qmake/compiler.pri)
 
 BUILDDIR=$$basename(PWD)
 SOURCEDIR=$$replace(BUILDDIR,-helper-build,-src)
@@ -67,13 +67,8 @@ macx {
   SOURCES *= ../lib/futex-stub.c sbcelt-sandbox-darwin.c pdeath-kqueue.c
 }
 
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 CONFIG(debug, debug|release) {
   DEFINES *= USE_LOGFILE
-  DESTDIR = ../../debug/
 }
 
 include(../../qmake/symbols.pri)
diff --git a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
index 1ed09f417..1c375bf5a 100644
--- a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
+++ b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro
@@ -52,13 +52,4 @@ macx {
   SOURCES *= futex-stub.c closefrom.c
 }
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 include(../../qmake/symbols.pri)
diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro
index 795667d51..abaa63cfb 100644
--- a/3rdparty/speex-build/speex-build.pro
+++ b/3rdparty/speex-build/speex-build.pro
@@ -13,15 +13,6 @@ include(../../qmake/compiler.pri)
   error("Aborting configuration")
 }
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 TEMPLATE = lib
 CONFIG -= qt
 CONFIG += debug_and_release
diff --git a/3rdparty/xinputcheck-build/xinputcheck-build.pro b/3rdparty/xinputcheck-build/xinputcheck-build.pro
index afa423676..9362b09c4 100644
--- a/3rdparty/xinputcheck-build/xinputcheck-build.pro
+++ b/3rdparty/xinputcheck-build/xinputcheck-build.pro
@@ -15,13 +15,4 @@ INCLUDEPATH = ../$$SOURCEDIR
 
 SOURCES *= xinputcheck.cpp
 
-CONFIG(debug, debug|release) {
-  CONFIG += console
-  DESTDIR = ../../debug
-}
-
-CONFIG(release, debug|release) {
-  DESTDIR = ../../release
-}
-
 include(../../qmake/symbols.pri)