diff options
| -rw-r--r-- | celt-0.7.0-build/celt-0.7.0-build.pro | 6 | ||||
| -rw-r--r-- | celt-0.8.0-build/celt-0.8.0-build.pro | 6 | ||||
| -rw-r--r-- | compiler.pri | 5 | ||||
| -rw-r--r-- | speexbuild/speexbuild.pro | 27 |
4 files changed, 33 insertions, 11 deletions
diff --git a/celt-0.7.0-build/celt-0.7.0-build.pro b/celt-0.7.0-build/celt-0.7.0-build.pro index 6a4460d30..bd5780ad8 100644 --- a/celt-0.7.0-build/celt-0.7.0-build.pro +++ b/celt-0.7.0-build/celt-0.7.0-build.pro @@ -33,8 +33,12 @@ QMAKE_CFLAGS -= -fPIE -pie win32 { DEFINES += WIN32 _WIN32 INCLUDEPATH += ../$$BUILDDIR/win32 - CONFIG(intelcpp) { + + CONFIG(sse2) { TARGET_VERSION_EXT = .$${VERSION}.sse2 + } else { + QMAKE_CFLAGS_RELEASE -= -arch:SSE + QMAKE_CFLAGS_DEBUG -= -arch:SSE } } diff --git a/celt-0.8.0-build/celt-0.8.0-build.pro b/celt-0.8.0-build/celt-0.8.0-build.pro index 9fd9756c3..48a787421 100644 --- a/celt-0.8.0-build/celt-0.8.0-build.pro +++ b/celt-0.8.0-build/celt-0.8.0-build.pro @@ -33,8 +33,12 @@ QMAKE_CFLAGS -= -fPIE -pie win32 { DEFINES += WIN32 _WIN32 INCLUDEPATH += ../$$BUILDDIR/win32 - CONFIG(intelcpp) { + + CONFIG(sse2) { TARGET_VERSION_EXT = .$${VERSION}.sse2 + } else { + QMAKE_CFLAGS_RELEASE -= -arch:SSE + QMAKE_CFLAGS_DEBUG -= -arch:SSE } } diff --git a/compiler.pri b/compiler.pri index d3b527b2f..0c3c55925 100644 --- a/compiler.pri +++ b/compiler.pri @@ -49,6 +49,11 @@ win32 { QMAKE_CXXFLAGS_DEBUG *= /analyze } DEFINES *= RESTRICT= + CONFIG(sse2) { + QMAKE_CFLAGS_RELEASE -= -arch:SSE + QMAKE_CFLAGS_DEBUG -= -arch:SSE + QMAKE_CFLAGS += -arch:SSE2 + } } CONFIG(symbols) { diff --git a/speexbuild/speexbuild.pro b/speexbuild/speexbuild.pro index 037f5d887..a81125ef5 100644 --- a/speexbuild/speexbuild.pro +++ b/speexbuild/speexbuild.pro @@ -13,6 +13,15 @@ include(../compiler.pri) error("Aborting configuration") } +CONFIG(debug, debug|release) { + CONFIG += console + DESTDIR = ../debug +} + +CONFIG(release, debug|release) { + DESTDIR = ../release +} + TEMPLATE = lib CONFIG -= qt CONFIG += debug_and_release @@ -27,10 +36,18 @@ win32 { INCLUDEPATH += ../speexbuild/win32 DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES SOURCES *= mumble_speex_init.c + + CONFIG(sse2) { + TARGET = speex.sse2 + DEFINES += _USE_SSE2 + } else { + QMAKE_CFLAGS_RELEASE -= -arch:SSE + QMAKE_CFLAGS_DEBUG -= -arch:SSE + } + !CONFIG(intelcpp) { DEFINES+=USE_SMALLFT } else { - TARGET = speex.sse2 LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.1\054\ipp\ia32\lib\ippsemerged" LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.1\054\ipp\ia32\lib\ippsmerged" LIBS *= -l"\Program Files (x86)\Intel/Compiler\11.1\054\ipp\ia32\lib\ippcorel" @@ -49,13 +66,5 @@ SOURCES *= mdf.c resample.c preprocess.c jitter.c filterbank.c fftwrap.c smallft # libspeex SOURCES *= bits.c cb_search.c exc_10_16_table.c exc_10_32_table.c exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c exc_8_128_table.c filters.c gain_table.c gain_table_lbr.c hexc_10_32_table.c hexc_table.c high_lsp_tables.c lpc.c lsp.c lsp_tables_nb.c ltp.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c scal.c speex.c speex_callbacks.c speex_header.c stereo.c vbr.c vq.c kiss_fft.c kiss_fftr.c vorbis_psy.c window.c -CONFIG(debug, debug|release) { - CONFIG += console - DESTDIR = ../debug -} - -CONFIG(release, debug|release) { - DESTDIR = ../release -} |