From ae2d567f59a19bf6c3e2b4d6548956d49d0b8bbe Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Wed, 29 Apr 2020 11:45:59 +0200
Subject: [PATCH] Externals: Fix include path for picojson and discord

---
 CMakeLists.txt                                     | 3 +++
 Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp | 2 +-
 Source/Core/UICommon/AutoUpdate.cpp                | 2 +-
 Source/Core/UICommon/DiscordPresence.cpp           | 2 +-
 Source/Core/UICommon/NetPlayIndex.cpp              | 2 +-
 Source/Core/UICommon/ResourcePack/Manifest.cpp     | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 864671c64e..47f99edf90 100644
--- a/CMakeLists.txt
+++ b/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
 #
diff --git a/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp b/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp
index a49b341cba..1372488506 100644
--- a/Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp
+++ b/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"
diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp
index b7c26fb707..9d4fffbe02 100644
--- a/Source/Core/UICommon/AutoUpdate.cpp
+++ b/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"
diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp
index 068b7994bd..c1aab0720b 100644
--- a/Source/Core/UICommon/DiscordPresence.cpp
+++ b/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"
diff --git a/Source/Core/UICommon/NetPlayIndex.cpp b/Source/Core/UICommon/NetPlayIndex.cpp
index 476a43eabc..0edf223acc 100644
--- a/Source/Core/UICommon/NetPlayIndex.cpp
+++ b/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"
diff --git a/Source/Core/UICommon/ResourcePack/Manifest.cpp b/Source/Core/UICommon/ResourcePack/Manifest.cpp
index 9c2bc6883e..b99372a137 100644
--- a/Source/Core/UICommon/ResourcePack/Manifest.cpp
+++ b/Source/Core/UICommon/ResourcePack/Manifest.cpp
@@ -4,7 +4,7 @@
 
 #include "UICommon/ResourcePack/Manifest.h"
 
-#include <picojson/picojson.h>
+#include <picojson.h>
 
 namespace ResourcePack
 {