diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-06 01:11:59 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-06 01:11:59 +0300 |
| commit | faa67303bd2db4d7c6d3c21f935d81453c2c64d2 (patch) | |
| tree | 5b4877edbd87291bcbdfb961cd64752b87d2902a /src | |
| parent | ec3120c1ab6e2eb944b8701bb2350ad92c185a25 (diff) | |
Move speex, celt-0.7.0, celt-0.11.0, opus and sbcelt to the 3rdparty directory.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/mumble.pro | 16 | ||||
| -rw-r--r-- | src/tests/OverlayTest.pro | 2 | ||||
| -rw-r--r-- | src/tests/Resample.pro | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index df8b00389..83d554a44 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -265,14 +265,14 @@ CONFIG(no-bundled-speex) { } !CONFIG(no-bundled-speex) { - INCLUDEPATH *= ../../speex/include ../../speex/libspeex ../../speexbuild + INCLUDEPATH *= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build LIBS *= -lspeex } CONFIG(sbcelt) { SOURCES -= CELTCodec.cpp SOURCES += CELTCodec_sbcelt.cpp - INCLUDEPATH *= ../../celt-0.7.0-src/libcelt ../../sbcelt-src + INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/sbcelt-src LIBS *= -lcelt -lsbcelt DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT } else { @@ -283,7 +283,7 @@ CONFIG(sbcelt) { INCLUDEPATH *= /usr/include/celt } !CONFIG(no-bundled-celt) { - INCLUDEPATH *= ../../celt-0.7.0-src/libcelt + INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt } } @@ -316,7 +316,7 @@ unix:!CONFIG(bundled-opus):system(pkg-config --exists opus) { } CONFIG(opus) { - INCLUDEPATH *= ../../opus-src/celt ../../opus-src/include ../../opus-src/src ../../opus-build/src + INCLUDEPATH *= ../../3rdparty/opus-src/celt ../../3rdparty/opus-src/include ../../3rdparty/opus-src/src ../../3rdparty/opus-build/src DEFINES *= USE_OPUS LIBS *= -lopus } @@ -374,10 +374,10 @@ unix { } !CONFIG(no-bundled-speex) { - QMAKE_CFLAGS *= -I../../speex/include -I../../speexbuild - QMAKE_CXXFLAGS *= -I../../speex/include -I../../speexbuild - QMAKE_CXXFLAGS_RELEASE *= -I../../speex/include -I../../speexbuild - QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild + QMAKE_CFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build + QMAKE_CXXFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build + QMAKE_CXXFLAGS_RELEASE *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build + QMAKE_CXXFLAGS_DEBUG *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build } CONFIG *= link_pkgconfig diff --git a/src/tests/OverlayTest.pro b/src/tests/OverlayTest.pro index f8ceb34ef..14028f903 100644 --- a/src/tests/OverlayTest.pro +++ b/src/tests/OverlayTest.pro @@ -15,4 +15,4 @@ win32 { } VPATH += .. -INCLUDEPATH += .. ../murmur ../mumble ../../celt-0.7.0-src/libcelt ../../speex/include +INCLUDEPATH += .. ../murmur ../mumble ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/speex-src/include diff --git a/src/tests/Resample.pro b/src/tests/Resample.pro index 9279f6572..7a85dde40 100644 --- a/src/tests/Resample.pro +++ b/src/tests/Resample.pro @@ -7,7 +7,7 @@ TARGET = Resample SOURCES = Resample.cpp Timer.cpp HEADERS = Timer.h VPATH += .. -INCLUDEPATH *= .. ../../speex/include ../../speex/libspeex ../../speexbuild +INCLUDEPATH *= .. ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build LIBS *= -lspeex win32 { |