From 18eb29fabd723853a5cb08398af848f62fd90d44 Mon Sep 17 00:00:00 2001
From: Starman0620 <28871190+Starman0620@users.noreply.github.com>
Date: Tue, 20 Apr 2021 14:34:54 -0400
Subject: [PATCH] Renamed rich presence module

---
 CMakeLists.txt                                  |  4 ++--
 {discord => discord-integration}/CMakeLists.txt | 14 ++++++--------
 {discord => discord-integration}/src/main.cpp   |  0
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename {discord => discord-integration}/CMakeLists.txt (55%)
 rename {discord => discord-integration}/src/main.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21a166d4..1da482ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ option(OPT_BUILD_AUDIO_SINK "Build Audio Sink Module (Depedencies: rtaudio)" ON)
 option(OPT_BUILD_FALCON9_DECODER "Build the falcon9 live decoder (Dependencies: ffplay)" OFF)
 option(OPT_BUILD_METEOR_DEMODULATOR "Build the meteor demodulator module (no dependencies required)" ON)
 option(OPT_BUILD_WEATHER_SAT_DECODER "Build the HRPT decoder module (no dependencies required)" ON)
-option(OPT_BUILD_DISCORD_PRESENCE "Build the Discord Rich Presence module (Dependencies: rapidjson)" ON)
+option(OPT_BUILD_DISCORD_PRESENCE "Build the Discord Rich Presence module" ON)
 # Core of SDR++
 add_subdirectory("core")
 
@@ -89,7 +89,7 @@ add_subdirectory("weather_sat_decoder")
 endif (OPT_BUILD_WEATHER_SAT_DECODER)
 
 if (OPT_BUILD_DISCORD_PRESENCE)
-add_subdirectory("discord")
+add_subdirectory("discord-integration")
 endif (OPT_BUILD_DISCORD_PRESENCE)
 
 if (MSVC)
diff --git a/discord/CMakeLists.txt b/discord-integration/CMakeLists.txt
similarity index 55%
rename from discord/CMakeLists.txt
rename to discord-integration/CMakeLists.txt
index 0d107ee5..67c4f0f8 100644
--- a/discord/CMakeLists.txt
+++ b/discord-integration/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(discord)
+project(discord-integration)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
@@ -11,13 +11,11 @@ endif ()
 
 file(GLOB SRC "src/*.cpp")
 
-include_directories("src/" "discord-rpc/include")
+include_directories("src/")
 
-add_subdirectory("discord-rpc")
-
-add_library(discord SHARED ${SRC})
-target_link_libraries(discord PUBLIC sdrpp_core discord-rpc)
-set_target_properties(discord PROPERTIES PREFIX "")
+add_library(integration SHARED ${SRC})
+target_link_libraries(integration PUBLIC sdrpp_core discord-rpc)
+set_target_properties(integration PROPERTIES PREFIX "")
 
 # Install directives
-install(TARGETS discord DESTINATION lib/sdrpp/plugins)
\ No newline at end of file
+install(TARGETS integration DESTINATION lib/sdrpp/plugins)
\ No newline at end of file
diff --git a/discord/src/main.cpp b/discord-integration/src/main.cpp
similarity index 100%
rename from discord/src/main.cpp
rename to discord-integration/src/main.cpp