diff --git a/CMakeLists.txt b/CMakeLists.txt index 021d50b..46e7ecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ find_package(TomMath REQUIRED) find_package(TomCrypt REQUIRED) find_package(Breakpad REQUIRED) find_package(Protobuf REQUIRED) -find_package(Boringssl REQUIRED) +find_package(Crypto REQUIRED) find_package(ThreadPool REQUIRED) find_package(CXXTerminal REQUIRED) find_package(StringVariable REQUIRED) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 259a28a..f3931c9 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -39,7 +39,8 @@ set(CMAKE_VERBOSE_MAKEFILE ON) set(SERVER_SOURCE_FILES main.cpp tomcryptTest.cpp - MySQLLibSSLFix.c + # Only needed for boringssl + # MySQLLibSSLFix.c src/client/ConnectedClient.cpp src/client/voice/PrecomputedPuzzles.cpp @@ -283,7 +284,7 @@ if (COMPILE_WEB_CLIENT) target_link_libraries(TeaSpeakServer ${glib20_DIR}/lib/x86_64-linux-gnu/libffi.so.7 ${nice_DIR}/lib/libnice.so.10) endif () -include_directories(${LIBRARY_PATH}/boringssl/include/) +# include_directories(${LIBRARY_PATH}/boringssl/include/) target_link_libraries(TeaSpeakServer openssl::ssl::shared openssl::crypto::shared diff --git a/shared b/shared index f994904..8cdcf31 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit f99490447ffa7a26f248058802a69d8532b1c7b6 +Subproject commit 8cdcf3145083df05d3548aaedc5c788f41eecc3a