From 4bab4ede7a63aa2b7fe0b3eeef9113e1afefa3c1 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 24 Jan 2020 15:46:28 +0100 Subject: [PATCH] TeaSpeak fully builds now --- CMakeLists.txt | 22 ++++++++-------------- MusicBot/CMakeLists.txt | 2 +- license/CMakeLists.txt | 16 ---------------- server/CMakeLists.txt | 10 ---------- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8987e98..bd4947a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,20 +65,14 @@ find_package(spdlog REQUIRED) find_package(Jemalloc REQUIRED) find_package(Protobuf REQUIRED) -#resolve_library(LIBRARY_TOM_MATH OFF "${LIBRARY_PATH}/tommath/build/libtommathStatic.a") -#resolve_library(LIBRARY_TOM_CRYPT OFF "${LIBRARY_PATH}/tomcrypt/libtomcrypt.a") -#resolve_library(LIBRARY_PATH_BREAKPAD OFF "${LIBRARY_PATH}/breakpad/build/src/client/linux/libbreakpad_client.a") -#resolve_library(LIBRARY_PATH_PROTOBUF OFF "${LIBRARY_PATH}/protobuf/build/libprotobuf.a") -#resolve_library(LIBRARY_PATH_BORINGSSL_SSL OFF "${LIBRARY_PATH}/boringssl/build/ssl/libssl.so") -#resolve_library(LIBRARY_PATH_BORINGSSL_CRYPTO OFF "${LIBRARY_PATH}/boringssl/build/crypto/libcrypto.so") -#resolve_library(LIBRARY_PATH_THREAD_POOL OFF "${LIBRARY_PATH}/Thread-Pool/build/libThreadPoolStatic.a") -#resolve_library(LIBRARY_PATH_TERMINAL OFF "${LIBRARY_PATH}/CXXTerminal/build/libCXXTerminalStatic.a") -#resolve_library(LIBRARY_PATH_VARIBALES OFF "${LIBRARY_PATH}/StringVariable/build/libStringVariablesStatic.a") -#resolve_library(LIBRARY_PATH_YAML OFF "${LIBRARY_PATH}/yaml-cpp/build/libyaml-cpp.a") -#resolve_library(LIBRARY_PATH_JSON OFF "${LIBRARY_PATH}/jsoncpp/build/src/lib_json/libjsoncpp.a") -#resolve_library(LIBRARY_PATH_ED255 OFF "${LIBRARY_PATH}/ed25519/build/libed25519.a") -#resolve_library(LIBRARY_PATH_DATA_PIPES OFF "${LIBRARY_PATH}/DataPipes/build/libDataPipes.so" "${LIBRARY_PATH}/DataPipes/cmake-build-release/libDataPipes.so" "${LIBRARY_PATH}/DataPipes/cmake-build-debug/libDataPipes.so") -#resolve_library(LIBRARY_PATH_OPUS OFF "${LIBRARY_PATH}/opus/build/.libs/libopus.a") + +#FIXME: Use module for this +include_directories(${ed25519_INCLUDE_DIR}) +include_directories(${ThreadPool_INCLUDE_DIR}) +include_directories(${DataPipes_INCLUDE_DIR}) +include_directories(${LIBEVENT_INCLUDE_DIRS}) +include_directories(${StringVariable_INCLUDE_DIR}) + resolve_library(LIBRARY_PATH_NICE OFF "${LIBRARY_PATH}/libnice/linux_${BUILD_OS_ARCH}/lib/libnice.a") message("Found libnice at ${LIBRARY_PATH_NICE}") diff --git a/MusicBot/CMakeLists.txt b/MusicBot/CMakeLists.txt index b3391a7..47e27e6 100644 --- a/MusicBot/CMakeLists.txt +++ b/MusicBot/CMakeLists.txt @@ -10,11 +10,11 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libs/) set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(../music/include/) -include_directories(../shared/src) add_definitions(-DLTM_DESC) #The basic library add_library(TeaMusic SHARED src/MusicPlayer.cpp) +target_link_libraries(TeaMusic PUBLIC TeaSpeak) #The test file add_executable(TeaMusicTest ${MUSIC_SOURCE_FILES} main.cpp) diff --git a/license/CMakeLists.txt b/license/CMakeLists.txt index 99a38dd..b6a8b3e 100644 --- a/license/CMakeLists.txt +++ b/license/CMakeLists.txt @@ -26,22 +26,6 @@ include_directories(${Protobuf_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS packets/LicenseRequest.proto packets/LicenseManager.proto) -#FIXME: Use modules for this! -find_package(Ed25519 REQUIRED) -include_directories(${ed25519_INCLUDE_DIR}) - -find_package(ThreadPool REQUIRED) -include_directories(${ThreadPool_INCLUDE_DIR}) - -find_package(DataPipes REQUIRED) -include_directories(${DataPipes_INCLUDE_DIR}) - -find_package(Libevent REQUIRED) -include_directories(${LIBEVENT_INCLUDE_DIRS}) - -find_package(StringVariable REQUIRED) -include_directories(${StringVariable_INCLUDE_DIR}) - #The actual librarie add_library(TeaLicenseHelper STATIC ${LICENCE_SOURCE_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) target_link_libraries(TeaLicenseHelper PUBLIC TeaSpeak) diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index e3af485..06451fe 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -14,16 +14,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/environment/) #disable for debug #add_definitions(-DRELEASE_MODE) -#FIXME! -find_package(DataPipes REQUIRED) -include_directories(${DataPipes_INCLUDE_DIR}) - -find_package(StringVariable REQUIRED) -include_directories(${StringVariable_INCLUDE_DIR}) - -find_package(Ed25519 REQUIRED) -include_directories(${ed25519_INCLUDE_DIR}) - include_directories(../music/include/) include_directories(../shared/src) include_directories(../license/src)