diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-26 15:08:34 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-26 15:08:34 +0300 |
| commit | ca8a117fae1182d873176030b558917a1acfdf13 (patch) | |
| tree | dde4b8233462c35c0eabf44978af1a8a31d954c3 /3rdparty | |
| parent | 153c0aa9d5b4a12546447f3204a057c395d99d8d (diff) | |
3rdparty/speex-build: add CONFIG += no_batch to speex-build.pro.
If we don't do it ourselves, qmake will add it automatically, and
warn to stdout.
The reason we need it here is because we use two VPATHs that include
files with the same names. That confuses nmake's inference rules, so
we have to disable them with no_batch.
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/speex-build/speex-build.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro index 250147b35..ceb8c4b02 100644 --- a/3rdparty/speex-build/speex-build.pro +++ b/3rdparty/speex-build/speex-build.pro @@ -28,7 +28,14 @@ CONFIG += debug_and_release CONFIG -= warn_on CONFIG += warn_off CONFIG += no_include_pwd + +# Enable no_batch, which disables nmake's inference rules. +# We have to do this because we use files from two VPATHs +# below, and nmake is unable to figure out how to handle +# that. +CONFIG += no_batch VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp + TARGET = speex DEFINES += NDEBUG HAVE_CONFIG_H INCLUDEPATH = ../speex-src/include ../speex-src/libspeex ../speexdsp-src/include ../speexdsp-src/libspeexdsp |