diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-27 03:13:57 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-27 03:13:57 +0300 |
| commit | 5cffbf3bd3e1f2db99072a26ad007e4c0a6e09eb (patch) | |
| tree | 52c352b8a25029310708eb12868e41695630589c /3rdparty | |
| parent | cb1732b69e54ee4bdda91d188d89b918b612b2ff (diff) | |
Always prepend 'release' or 'debug' dirs when adding to QMAKE_LIBDIR.
This commit changes various pri and pro files to always prepend
the global build output directory (which can be either 'release'
or 'debug', depending on the current build configuration).
Otherwise, if a library that we build ourselves, such as -lspeex in
CONFIG+=bundled-speex, is also available in one of the other lib dirs,
we can't be sure that the one in our build output directory will be used.
This is a problem on FreeBSD, where we add /usr/local/lib
to the QMAKE_LIBDIR in compiler.pri. That directory might contain
its own -lspeex.
With this change, we now prefer libraries in our build output directory
to system libraries.
Diffstat (limited to '3rdparty')
| -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 |
3 files changed, 3 insertions, 3 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 |