TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make stuff work

Browse Source
This commit is contained in:
WolverinDEV 2020-01-24 17:06:52 +01:00
parent c3a654efe9
commit b099578957
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -55,8 +55,6 @@ find_package(CXXTerminal REQUIRED)
find_package(StringVariable REQUIRED) find_package(StringVariable REQUIRED)
find_package(yaml-cpp REQUIRED) find_package(yaml-cpp REQUIRED)
set(LIBEVENT_STATIC_LINK TRUE)
find_package(Libevent REQUIRED)
find_package(jsoncpp REQUIRED) find_package(jsoncpp REQUIRED)
find_package(Ed25519 REQUIRED) find_package(Ed25519 REQUIRED)
find_package(DataPipes REQUIRED) find_package(DataPipes REQUIRED)
@ -65,6 +63,12 @@ find_package(spdlog REQUIRED)
find_package(Jemalloc REQUIRED) find_package(Jemalloc REQUIRED)
find_package(Protobuf REQUIRED) find_package(Protobuf REQUIRED)
# LibEvent fucks up the CMAKE_FIND_LIBRARY_SUFFIXES variable
function(find_event)
set(LIBEVENT_STATIC_LINK TRUE)
find_package(Libevent REQUIRED)
endfunction()
find_event()
#FIXME: Use module for this #FIXME: Use module for this
include_directories(${ed25519_INCLUDE_DIR}) include_directories(${ed25519_INCLUDE_DIR})

2
music

@ -1 +1 @@
Subproject commit a0a2a454d3847325c5b1ee14c1c98610c4d470e1 Subproject commit 6bdb628586efd7f61c6746391c664c335b8b6d44

2
server/CMakeLists.txt
View File

@ -256,7 +256,7 @@ target_link_libraries(TeaSpeakServer
${YAML_CPP_LIBRARIES} ${YAML_CPP_LIBRARIES}
pthread pthread
stdc++fs stdc++fs
event_static event_pthreads libevent::core libevent::pthreads
opus::static opus::static
yaml-cpp yaml-cpp
${LIBRARY_PATH_PROTOBUF} ${LIBRARY_PATH_PROTOBUF}

2
shared

@ -1 +1 @@
Subproject commit 239c6e69f949c245cafea1081630b787e075f764 Subproject commit deeba1b73ebdc4aaa07c36b9c0b97e21511356df