From b09957895758cf09f71922db47d027cbd2c786ab Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Fri, 24 Jan 2020 17:06:52 +0100
Subject: [PATCH] Make stuff work

---
 CMakeLists.txt        | 8 ++++++--
 music                 | 2 +-
 server/CMakeLists.txt | 2 +-
 shared                | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6fd859..1c0c793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,6 @@ find_package(CXXTerminal REQUIRED)
 find_package(StringVariable REQUIRED)
 
 find_package(yaml-cpp REQUIRED)
-set(LIBEVENT_STATIC_LINK TRUE)
-find_package(Libevent REQUIRED)
 find_package(jsoncpp REQUIRED)
 find_package(Ed25519 REQUIRED)
 find_package(DataPipes REQUIRED)
@@ -65,6 +63,12 @@ find_package(spdlog REQUIRED)
 find_package(Jemalloc 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
 include_directories(${ed25519_INCLUDE_DIR})
diff --git a/music b/music
index a0a2a45..6bdb628 160000
--- a/music
+++ b/music
@@ -1 +1 @@
-Subproject commit a0a2a454d3847325c5b1ee14c1c98610c4d470e1
+Subproject commit 6bdb628586efd7f61c6746391c664c335b8b6d44
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 06451fe..90121a9 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -256,7 +256,7 @@ target_link_libraries(TeaSpeakServer
         ${YAML_CPP_LIBRARIES}
         pthread
         stdc++fs
-        event_static event_pthreads
+        libevent::core libevent::pthreads
         opus::static
         yaml-cpp
         ${LIBRARY_PATH_PROTOBUF}
diff --git a/shared b/shared
index 239c6e6..deeba1b 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 239c6e69f949c245cafea1081630b787e075f764
+Subproject commit deeba1b73ebdc4aaa07c36b9c0b97e21511356df