BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-08-17 16:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed discord-rpc library

Browse Source
This commit is contained in:
Anonymous275 2022-01-19 23:13:27 +02:00
parent 09b18a40c5
commit 27e61bc566
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,6 +13,3 @@
[submodule "include/easyloggingpp"] [submodule "include/easyloggingpp"]
path = include/easyloggingpp path = include/easyloggingpp
url = https://github.com/amrayn/easyloggingpp.git url = https://github.com/amrayn/easyloggingpp.git
[submodule "include/discord-rpc"]
path = include/discord-rpc
url = https://github.com/discord/discord-rpc.git

6
CMakeLists.txt
View File

@ -24,7 +24,6 @@ set(wxBUILD_USE_STATIC_RUNTIME ON)
add_subdirectory(include/wxWidgets) add_subdirectory(include/wxWidgets)
add_subdirectory(include/rapidjson) add_subdirectory(include/rapidjson)
add_subdirectory(include/discord-rpc)
add_subdirectory(include/cpp-httplib) add_subdirectory(include/cpp-httplib)
add_subdirectory(include/tomlplusplus) add_subdirectory(include/tomlplusplus)
@ -47,13 +46,12 @@ add_executable(${PROJECT_NAME}
if (WIN32) if (WIN32)
target_link_libraries(${PROJECT_NAME} PRIVATE 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 else(WIN32) #MINGW
add_definitions("-D_WIN32_WINNT=0x0600") add_definitions("-D_WIN32_WINNT=0x0600")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static") 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) endif(WIN32)
add_definitions(-DELPP_NO_DEFAULT_LOG_FILE) add_definitions(-DELPP_NO_DEFAULT_LOG_FILE)
target_include_directories(${PROJECT_NAME} PRIVATE "include") target_include_directories(${PROJECT_NAME} PRIVATE "include")
target_include_directories(${PROJECT_NAME} PRIVATE "include/rapidjson/include") target_include_directories(${PROJECT_NAME} PRIVATE "include/rapidjson/include")
target_include_directories(${PROJECT_NAME} PRIVATE "include/discord-rpc/include")

1
include/discord-rpc

@ -1 +0,0 @@
Subproject commit e4c0c569eca9b888010ad904d3633e782f5cd680

5
src/Discord.cpp
View File

@ -3,12 +3,11 @@
/// Copyright (c) 2021-present Anonymous275 read the LICENSE file for more info. /// Copyright (c) 2021-present Anonymous275 read the LICENSE file for more info.
/// ///
#include <discord_rpc.h>
#include "Launcher.h" #include "Launcher.h"
#include "Logger.h" #include "Logger.h"
void Launcher::RichPresence() { void Launcher::RichPresence() {
Discord_Initialize("629743237988352010", nullptr, 1, nullptr); /*Discord_Initialize("629743237988352010", nullptr, 1, nullptr);
while(!Shutdown.load()) { while(!Shutdown.load()) {
DiscordRichPresence discordPresence; DiscordRichPresence discordPresence;
memset(&discordPresence, 0, sizeof(discordPresence)); memset(&discordPresence, 0, sizeof(discordPresence));
@ -18,7 +17,7 @@ void Launcher::RichPresence() {
Discord_UpdatePresence(&discordPresence); Discord_UpdatePresence(&discordPresence);
std::this_thread::sleep_for(std::chrono::seconds(1)); std::this_thread::sleep_for(std::chrono::seconds(1));
} }
Discord_ClearPresence(); Discord_ClearPresence();*/
} }
void Launcher::RunDiscordRPC() { void Launcher::RunDiscordRPC() {