diff options
author | Robert Adam <dev@robert-adam.de> | 2020-05-07 09:14:09 +0300 |
---|---|---|
committer | Robert Adam <dev@robert-adam.de> | 2020-05-07 09:14:09 +0300 |
commit | c5644c7d73a247b00fef9db38738e4a00653c8e9 (patch) | |
tree | 805ac5a9e678190e26f984932f862523a087bdcf | |
parent | 5be2bb965faa5e0b6c691d8dc3a6f2692355c97e (diff) |
3rdparty: Removed sbcelt submodule as it is not used and broken
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | 3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro | 74 | ||||
-rw-r--r-- | 3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro | 55 | ||||
m--------- | 3rdparty/sbcelt-src | 0 |
4 files changed, 0 insertions, 132 deletions
diff --git a/.gitmodules b/.gitmodules index 6f8968220..d5b4d9042 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "opus-src"] path = 3rdparty/opus-src url = https://github.com/mumble-voip/opus.git -[submodule "sbcelt-src"] - path = 3rdparty/sbcelt-src - url = https://github.com/mumble-voip/sbcelt.git [submodule "3rdparty/minhook-src"] path = 3rdparty/minhook-src url = https://github.com/mumble-voip/minhook.git diff --git a/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro b/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro deleted file mode 100644 index 3fa7b88f0..000000000 --- a/3rdparty/sbcelt-helper-build/sbcelt-helper-build.pro +++ /dev/null @@ -1,74 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-helper-build,-src) -CELTDIR=../celt-0.7.0-src/libcelt - -!exists($$CELTDIR/../COPYING) { - message("The $$CELTDIR/ directory was not found. Please update your submodules (git submodule update --init).") - error("Aborting configuration") -} - -!exists(../$$SOURCEDIR/LICENSE) { - message("The $$SOURCEDIR/ directory was not found. You need to do the following:") - message("") - message("Use SBCELT Git:") - message("git submodule init") - message("git submodule update") - message("") - error("Aborting configuration") -} - -TEMPLATE = app -CONFIG -= qt app_bundle -CONFIG *= debug_and_release -CONFIG -= warn-on -VPATH = ../$$SOURCEDIR/helper -TARGET = sbcelt-helper -DEFINES += HAVE_CONFIG_H -INCLUDEPATH += ../$$SOURCEDIR/helper ../$$SOURCEDIR/lib ../$$SOURCEDIR $$CELTDIR -LIBS += -lpthread - -SOURCES = \ - $$CELTDIR/bands.c \ - $$CELTDIR/celt.c \ - $$CELTDIR/cwrs.c \ - $$CELTDIR/entcode.c \ - $$CELTDIR/entdec.c \ - $$CELTDIR/entenc.c \ - $$CELTDIR/header.c \ - $$CELTDIR/kiss_fft.c \ - $$CELTDIR/kiss_fftr.c \ - $$CELTDIR/laplace.c \ - $$CELTDIR/mdct.c \ - $$CELTDIR/modes.c \ - $$CELTDIR/pitch.c \ - $$CELTDIR/psy.c \ - $$CELTDIR/quant_bands.c \ - $$CELTDIR/rangedec.c \ - $$CELTDIR/rangeenc.c \ - $$CELTDIR/rate.c \ - $$CELTDIR/vq.c \ - sbcelt-helper.c \ - alloc.c - -unix:!macx { - UNAME=$$system(uname -s) - contains(UNAME, Linux) { - SOURCES *= ../lib/futex-linux.c seccomp-sandbox.c sbcelt-sandbox-linux.c pdeath-linux.c - LIBS += -lrt - } - contains(UNAME, FreeBSD) { - SOURCES *= ../lib/futex-freebsd.c sbcelt-sandbox-freebsd.c pdeath-kqueue.c - } -} - -macx { - SOURCES *= ../lib/futex-stub.c sbcelt-sandbox-darwin.c pdeath-kqueue.c -} - -CONFIG(debug, debug|release) { - DEFINES *= USE_LOGFILE -} - -include(../../qmake/symbols.pri) diff --git a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro b/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro deleted file mode 100644 index 1c375bf5a..000000000 --- a/3rdparty/sbcelt-lib-build/sbcelt-lib-build.pro +++ /dev/null @@ -1,55 +0,0 @@ -include(../../qmake/compiler.pri) - -BUILDDIR=$$basename(PWD) -SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src) -CELTDIR=../celt-0.7.0-src - -!exists($$CELTDIR/COPYING) { - message("The $$CELTDIR/ directory was not found. Please update your submodules (git submodule update --init).") - error("Aborting configuration") -} - -!exists(../$$SOURCEDIR/LICENSE) { - message("The $$SOURCEDIR/ directory was not found. You need to do the following:") - message("") - message("Use SBCELT Git:") - message("git submodule init") - message("git submodule update") - message("") - error("Aborting configuration") -} - -TEMPLATE = lib -CONFIG -= qt -CONFIG += debug_and_release -CONFIG -= warn_on -CONFIG += warn_off -CONFIG += static -VPATH = ../$$SOURCEDIR/lib -TARGET = sbcelt -INCLUDEPATH = $$CELTDIR/libcelt -DEFINES += SBCELT_PREFIX_API - -QMAKE_CFLAGS -= -fPIE -pie - -unix { - INCLUDEPATH += ../$$BUILDDIR -} - -SOURCES *= libsbcelt.c mtime.c stub.c - -unix:!macx { - UNAME=$$system(uname -s) - contains(UNAME, Linux) { - SOURCES *= futex-linux.c closefrom.c - } - contains(UNAME, FreeBSD) { - SOURCES *= futex-freebsd.c closefrom-sys.c - } -} - -macx { - SOURCES *= futex-stub.c closefrom.c -} - -include(../../qmake/symbols.pri) diff --git a/3rdparty/sbcelt-src b/3rdparty/sbcelt-src deleted file mode 160000 -Subproject 045493d60b269ddb0096121552fd4d912704d4b |