diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-05-06 00:08:30 +0300 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-05-06 21:22:11 +0300 |
| commit | 2c0d37f9ef089032850e873e341b1399acbf5aad (patch) | |
| tree | f7bfb76d74f2c4faf274454463be88bdfeefcba2 /3rdparty/speex-build | |
| parent | 263a2928ca367af334beeb0cca81c372d5c223b6 (diff) | |
Switch from old speex to new speex and speexdsp
The speex library has been split into a codec part
(speex) and a dsp part (speex-dsp). As we still need
the codec for compatibility with 3rd party clients
only sending speex but still want the updates that
went into the dsp and codec since then this patch
modifies our build to enable that. To achieve that
we combined the two libraries back together. Doing
it this way might brittle but is only a temporary
solution until we can actually drop the codec part.
Diffstat (limited to '3rdparty/speex-build')
| -rw-r--r-- | 3rdparty/speex-build/speex-build.pro | 10 | ||||
| -rw-r--r-- | 3rdparty/speex-build/speex_config_types.h (renamed from 3rdparty/speex-build/speex/speex_config_types.h) | 0 | ||||
| -rw-r--r-- | 3rdparty/speex-build/speexdsp_config_types.h | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/3rdparty/speex-build/speex-build.pro b/3rdparty/speex-build/speex-build.pro index 9656e4e2e..98d461dd6 100644 --- a/3rdparty/speex-build/speex-build.pro +++ b/3rdparty/speex-build/speex-build.pro @@ -1,13 +1,13 @@ include(../../compiler.pri) -!exists(../speex-src/COPYING) { - message("The speex/ directory was not found. You need to do one of the following:") +!exists(../speex-src/COPYING) | !exists(../speexdsp-src/COPYING) { + message("The speex-src/ or speexdsp-src/ directories were not found. You need to do one of the following:") message("") message("Option 1: Use Speex Git:") message("git submodule init") message("git submodule update") message("") - message("Option 2: Use system speex (only if it's a bleeding edge version):") + message("Option 2: Use system speex and speex-dsp (v 1.2 or later):") message("qmake CONFIG+=no-bundled-speex -recursive") message("") error("Aborting configuration") @@ -28,10 +28,10 @@ CONFIG += debug_and_release CONFIG -= warn_on CONFIG += warn_off CONFIG += no_include_pwd -VPATH = ../speex-src/libspeex +VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp TARGET = speex DEFINES += NDEBUG HAVE_CONFIG_H -INCLUDEPATH = ../speex-src/include ../speex-src/libspeex +INCLUDEPATH = ../speex-src/include ../speex-src/libspeex ../speexdsp-src/include ../speexdsp-src/libspeexdsp win32 { INCLUDEPATH += ../speex-build/win32 diff --git a/3rdparty/speex-build/speex/speex_config_types.h b/3rdparty/speex-build/speex_config_types.h index bd548546b..bd548546b 100644 --- a/3rdparty/speex-build/speex/speex_config_types.h +++ b/3rdparty/speex-build/speex_config_types.h diff --git a/3rdparty/speex-build/speexdsp_config_types.h b/3rdparty/speex-build/speexdsp_config_types.h new file mode 100644 index 000000000..bd548546b --- /dev/null +++ b/3rdparty/speex-build/speexdsp_config_types.h @@ -0,0 +1,11 @@ +#ifndef __SPEEX_TYPES_H__ +#define __SPEEX_TYPES_H__ + +/* these are filled in by configure */ +typedef short spx_int16_t; +typedef unsigned short spx_uint16_t; +typedef int spx_int32_t; +typedef unsigned int spx_uint32_t; + +#endif + |