diff options
author | Davide Beatrici <davidebeatrici@gmail.com> | 2017-03-10 01:03:08 +0300 |
---|---|---|
committer | Davide Beatrici <davidebeatrici@gmail.com> | 2017-03-17 21:14:16 +0300 |
commit | d84dc1a4ddbb22cfd3f2bbf395c3e5b7ec0d3dc0 (patch) | |
tree | 038a547a891afb84940eb6b629708d405ab21856 /3rdparty | |
parent | 322e7112d39d42f15dc62bc1052a67b3b80efa11 (diff) |
speex-build.pro: Use Unix-like config.h for the MinGW build, instead of win32/config.h"
Diffstat (limited to '3rdparty')
-rw-r--r-- | 3rdparty/speex-build/speex-build.pro | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro index 755665a15..0955c9389 100644 --- a/3rdparty/speex-build/speex-build.pro +++ b/3rdparty/speex-build/speex-build.pro @@ -43,19 +43,29 @@ INCLUDEPATH = ../speex-src/include ../speex-src/libspeex ../speexdsp-src/include win32 { INCLUDEPATH += ../speex-build/win32 DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES + + win32-g++ { + # MinGW uses the config.h for Unix-like systems. + INCLUDEPATH += ../speex-build + } + + win32-msvc* { + INCLUDEPATH += ../speex-build/win32 + + CONFIG(sse2) { + TARGET = speex.sse2 + DEFINES += _USE_SSE2 + } else { + QMAKE_CFLAGS_RELEASE -= -arch:SSE + QMAKE_CFLAGS_DEBUG -= -arch:SSE + } + } + SOURCES *= mumble_speex_init.c CONFIG -= static CONFIG += shared - CONFIG(sse2) { - TARGET = speex.sse2 - DEFINES += _USE_SSE2 - } else { - QMAKE_CFLAGS_RELEASE -= -arch:SSE - QMAKE_CFLAGS_DEBUG -= -arch:SSE - } - DEFINES+=USE_SMALLFT } else { |