diff options
| -rw-r--r-- | 3rdparty/speex-build/AGC.pro | 2 | ||||
| -rw-r--r-- | 3rdparty/speex-build/ResampMark.pro | 2 | ||||
| -rw-r--r-- | 3rdparty/speex-build/SpeexMark.pro | 2 | ||||
| -rw-r--r-- | overlay/overlay-shared.pro | 4 | ||||
| -rw-r--r-- | overlay_gl/overlay_gl.pro | 4 | ||||
| -rw-r--r-- | src/mumble.pri | 4 | ||||
| -rw-r--r-- | src/tests/Resample.pro | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/3rdparty/speex-build/AGC.pro b/3rdparty/speex-build/AGC.pro index 790072067..fd8e7fb78 100644 --- a/3rdparty/speex-build/AGC.pro +++ b/3rdparty/speex-build/AGC.pro @@ -8,4 +8,4 @@ SOURCES = AGC.cpp HEADERS = Timer.h INCLUDEPATH = ../src ../speex-src/include LIBS += -lspeex -QMAKE_LIBDIR += ../../release +QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/3rdparty/speex-build/ResampMark.pro b/3rdparty/speex-build/ResampMark.pro index e38995c06..03ed771ab 100644 --- a/3rdparty/speex-build/ResampMark.pro +++ b/3rdparty/speex-build/ResampMark.pro @@ -8,4 +8,4 @@ SOURCES = ResampMark.cpp HEADERS = Timer.h INCLUDEPATH = ../../src ../speex-src/include LIBS += -lspeex -QMAKE_LIBDIR += ../../release +QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/3rdparty/speex-build/SpeexMark.pro b/3rdparty/speex-build/SpeexMark.pro index e479512ef..ae9c3bfab 100644 --- a/3rdparty/speex-build/SpeexMark.pro +++ b/3rdparty/speex-build/SpeexMark.pro @@ -8,4 +8,4 @@ SOURCES = SpeexMark.cpp HEADERS = Timer.h INCLUDEPATH = ../src ../speex-src/include LIBS += -lspeex -QMAKE_LIBDIR += ../../release +QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro index 8de618d3c..46af44605 100644 --- a/overlay/overlay-shared.pro +++ b/overlay/overlay-shared.pro @@ -39,12 +39,12 @@ CONFIG(force-x86_64-toolchain) { CONFIG(release, debug|release) { DESTDIR = ../release - QMAKE_LIBDIR += ../release + QMAKE_LIBDIR = ../release $$QMAKE_LIBDIR } CONFIG(debug, debug|release) { DESTDIR = ../debug - QMAKE_LIBDIR += ../debug + QMAKE_LIBDIR = ../debug $$QMAKE_LIBDIR DEFINES *= DEBUG } diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index b871774d7..9d1d951ac 100644 --- a/overlay_gl/overlay_gl.pro +++ b/overlay_gl/overlay_gl.pro @@ -58,12 +58,12 @@ macx { } CONFIG(debug, debug|release) { - QMAKE_LIBDIR *= ../debug$(DESTDIR_ADD) + QMAKE_LIBDIR = ../debug$(DESTDIR_ADD) $$QMAKE_LIBDIR DESTDIR = ../debug$(DESTDIR_ADD) } CONFIG(release, debug|release) { - QMAKE_LIBDIR *= ../release$(DESTDIR_ADD) + QMAKE_LIBDIR = ../release$(DESTDIR_ADD) $$QMAKE_LIBDIR DESTDIR = ../release$(DESTDIR_ADD) } diff --git a/src/mumble.pri b/src/mumble.pri index 66aa96da8..b8cd28426 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -70,11 +70,11 @@ isEqual(QT_MAJOR_VERSION, 4) { CONFIG(debug, debug|release) { CONFIG += console - QMAKE_LIBDIR += ../../debug + QMAKE_LIBDIR = ../../debug $$QMAKE_LIBDIR DESTDIR = ../../debug } CONFIG(release, debug|release) { - QMAKE_LIBDIR += ../../release + QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR DESTDIR = ../../release } diff --git a/src/tests/Resample.pro b/src/tests/Resample.pro index 2fd1e1643..edfac70d5 100644 --- a/src/tests/Resample.pro +++ b/src/tests/Resample.pro @@ -21,11 +21,11 @@ win32 { } CONFIG(debug, debug|release) { - QMAKE_LIBDIR += ../../debug + QMAKE_LIBDIR = ../../debug $$QMAKE_LIBDIR DESTDIR = ../../debug } CONFIG(release, debug|release) { - QMAKE_LIBDIR += ../../release + QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR DESTDIR = ../../release } |