diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-10-21 18:37:16 +0400 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-10-21 18:37:16 +0400 |
| commit | e73c9b0ec21d97b9add7f44e4e5f9cb1bb1acb1f (patch) | |
| tree | c19ae7c2f917716248cb4e7a8a48d50884994912 /speexbuild | |
| parent | 6216f4acb17ed53a70f4bd9e834f79ca472cd20c (diff) | |
Compile released snapshots with IPP
Diffstat (limited to 'speexbuild')
| -rw-r--r-- | speexbuild/speexbuild.pro | 11 | ||||
| -rw-r--r-- | speexbuild/win32/config.h | 26 |
2 files changed, 32 insertions, 5 deletions
diff --git a/speexbuild/speexbuild.pro b/speexbuild/speexbuild.pro index 5753a21b3..024dd9548 100644 --- a/speexbuild/speexbuild.pro +++ b/speexbuild/speexbuild.pro @@ -24,12 +24,13 @@ DEFINES += NDEBUG HAVE_CONFIG_H INCLUDEPATH = ../speex/include ../speex/libspeex win32 { - INCLUDEPATH += ../speex/win32 + INCLUDEPATH += ../speexbuild/win32 DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES -} - -unix { - INCLUDEPATH += ../speexbuild + !CONFIG(intelcpp) { + DEFINES+=USE_SMALLFT + } +} else { + INCLUDEPATH += ../speexbuild } macx { diff --git a/speexbuild/win32/config.h b/speexbuild/win32/config.h new file mode 100644 index 000000000..47a4ffd13 --- /dev/null +++ b/speexbuild/win32/config.h @@ -0,0 +1,26 @@ +// Microsoft version of 'inline' +#define inline __inline + +// In Visual Studio, _M_IX86_FP=1 means /arch:SSE was used, likewise +// _M_IX86_FP=2 means /arch:SSE2 was used. +// Also, enable both _USE_SSE and _USE_SSE2 if we're compiling for x86-64 +#if _M_IX86_FP >= 1 || defined(_M_X64) +#define _USE_SSE +#endif + +#if _M_IX86_FP >= 2 || defined(_M_X64) +#define _USE_SSE2 +#endif + +// Visual Studio support alloca(), but it always align variables to 16-bit +// boundary, while SSE need 128-bit alignment. So we disable alloca() when +// SSE is enabled. +#ifndef _USE_SSE +# define USE_ALLOCA +#endif + +/* Default to floating point */ +#define FLOATING_POINT + +/* We don't support visibility on Win32 */ +#define EXPORT |