Externals: Fix include path for picojson and discord

CMakeLists.txt

@@ -755,6 +755,7 @@ endif()
 if(USE_DISCORD_PRESENCE)
   message(STATUS "Using static DiscordRPC from Externals")
   add_subdirectory(Externals/discord-rpc)
+  include_directories(Externals/discord-rpc/include)
 endif()
 
 find_package(Libsystemd)
@@ -765,6 +766,8 @@ else()
   message(STATUS "libsystemd not found, disabling traversal server watchdog support")
 endif()
 
+include_directories(Externals/picojson)
+
 ########################################
 # Pre-build events: Define configuration variables and write SCM info header
 #

Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp

@@ -11,7 +11,7 @@
 #include <QPixmap>
 #include <QPushButton>
 
-#include <discord-rpc/include/discord_rpc.h>
+#include <discord_rpc.h>
 
 #include "Common/HttpRequest.h"
 #include "Common/StringUtil.h"

Source/Core/UICommon/AutoUpdate.cpp

@@ -4,7 +4,7 @@
 
 #include "UICommon/AutoUpdate.h"
 
-#include <picojson/picojson.h>
+#include <picojson.h>
 #include <string>
 
 #include "Common/CommonPaths.h"

Source/Core/UICommon/DiscordPresence.cpp

@@ -16,7 +16,7 @@
 #include <set>
 #include <string>
 
-#include <discord-rpc/include/discord_rpc.h>
+#include <discord_rpc.h>
 #include <fmt/format.h>
 
 #include "Common/Hash.h"

Source/Core/UICommon/NetPlayIndex.cpp

@@ -8,7 +8,7 @@
 #include <numeric>
 #include <string>
 
-#include <picojson/picojson.h>
+#include <picojson.h>
 
 #include "Common/Common.h"
 #include "Common/HttpRequest.h"

Source/Core/UICommon/ResourcePack/Manifest.cpp

@@ -4,7 +4,7 @@
 
 #include "UICommon/ResourcePack/Manifest.h"
 
-#include <picojson/picojson.h>
+#include <picojson.h>
 
 namespace ResourcePack
 {