diff --git a/.gitmodules b/.gitmodules index 5eda04d..0c68433 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "include/easyloggingpp"] path = include/easyloggingpp url = https://github.com/amrayn/easyloggingpp.git -[submodule "include/discord-rpc"] - path = include/discord-rpc - url = https://github.com/discord/discord-rpc.git diff --git a/CMakeLists.txt b/CMakeLists.txt index c7adec0..b3b90f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,6 @@ set(wxBUILD_USE_STATIC_RUNTIME ON) add_subdirectory(include/wxWidgets) add_subdirectory(include/rapidjson) -add_subdirectory(include/discord-rpc) add_subdirectory(include/cpp-httplib) add_subdirectory(include/tomlplusplus) @@ -47,13 +46,12 @@ add_executable(${PROJECT_NAME} if (WIN32) target_link_libraries(${PROJECT_NAME} PRIVATE - ZLIB::ZLIB discord-rpc OpenSSL::SSL OpenSSL::Crypto ws2_32 wx::net wx::core wx::base Dbghelp) + ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32 wx::net wx::core wx::base Dbghelp) else(WIN32) #MINGW add_definitions("-D_WIN32_WINNT=0x0600") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static") - target_link_libraries(${PROJECT_NAME} discord-rpc ssl crypto ws2_32 ssp crypt32 z Dbghelp) + target_link_libraries(${PROJECT_NAME} ssl crypto ws2_32 ssp crypt32 z Dbghelp) endif(WIN32) add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) target_include_directories(${PROJECT_NAME} PRIVATE "include") target_include_directories(${PROJECT_NAME} PRIVATE "include/rapidjson/include") -target_include_directories(${PROJECT_NAME} PRIVATE "include/discord-rpc/include") diff --git a/include/discord-rpc b/include/discord-rpc deleted file mode 160000 index e4c0c56..0000000 --- a/include/discord-rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4c0c569eca9b888010ad904d3633e782f5cd680 diff --git a/src/Discord.cpp b/src/Discord.cpp index d753ce5..f3995a7 100644 --- a/src/Discord.cpp +++ b/src/Discord.cpp @@ -3,12 +3,11 @@ /// Copyright (c) 2021-present Anonymous275 read the LICENSE file for more info. /// -#include #include "Launcher.h" #include "Logger.h" void Launcher::RichPresence() { - Discord_Initialize("629743237988352010", nullptr, 1, nullptr); + /*Discord_Initialize("629743237988352010", nullptr, 1, nullptr); while(!Shutdown.load()) { DiscordRichPresence discordPresence; memset(&discordPresence, 0, sizeof(discordPresence)); @@ -18,7 +17,7 @@ void Launcher::RichPresence() { Discord_UpdatePresence(&discordPresence); std::this_thread::sleep_for(std::chrono::seconds(1)); } - Discord_ClearPresence(); + Discord_ClearPresence();*/ } void Launcher::RunDiscordRPC() {