mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD(opus): Fetch submodule from upstream repository

Browse Source 
Upon switching to CMake, we kept using our own fork for the repository because a few fixes for the build were needed.

Now that the upstream repository works correctly as submodule, we can fetch from it directly.

Please note that tests provided in the Opus repository are not built anymore.

Fixes #5223.
This commit is contained in:
Davide Beatrici 2021-08-10 00:48:42 +02:00
parent a33fcec775
commit a4fdc46a80
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -6,7 +6,7 @@
url = https://github.com/mumble-voip/celt-0.7.0.git
[submodule "opus"]
path = 3rdparty/opus
url = https://github.com/mumble-voip/opus.git
url = https://gitlab.xiph.org/xiph/opus.git
[submodule "3rdparty/minhook"]
path = 3rdparty/minhook
url = https://github.com/mumble-voip/minhook.git

2
3rdparty/opus vendored

@ -1 +1 @@
Subproject commit 296d213da679eea977a869583b59f1e5a51b9ff5
Subproject commit 6b6035ae4a29abbd237463d84a45fbeb0d92bc18

4
src/mumble/CMakeLists.txt
View File

@ -639,10 +639,6 @@ if(bundled-opus)
target_include_directories(mumble PRIVATE "${3RDPARTY_DIR}/opus/include")
if(tests)
set_target_properties(test_opus_decode test_opus_padding PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
endif()
if(WIN32)
# Shared library on Windows (e.g. ".dll")
set_target_properties(opus PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})