Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidebeatrici <davidebeatrici@gmail.com>2018-02-18 23:52:48 +0300
committerdavidebeatrici <davidebeatrici@gmail.com>2018-02-19 01:56:34 +0300
commit209255df67098860c04af1f357262f1fc932d8dc (patch)
tree51d3873dd594c46cf04ebc0d05170c5a48927ff8 /3rdparty/celt-0.7.0-build
parent696e968d809a27ab385c685636d169f3d6361253 (diff)
3rdparty: don't set custom build directories, aside from the two CELT versions
Diffstat (limited to '3rdparty/celt-0.7.0-build')
-rw-r--r--3rdparty/celt-0.7.0-build/celt-0.7.0-build.pro14
1 files changed, 6 insertions, 8 deletions
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)