ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Externals: Fix include path for picojson and discord

This commit is contained in:
degasus 2020-04-29 11:45:59 +02:00
parent 239cde8aea
commit ae2d567f59
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

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

2
Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp
View File

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

2
Source/Core/UICommon/AutoUpdate.cpp
View File

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

2
Source/Core/UICommon/DiscordPresence.cpp
View File

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

2
Source/Core/UICommon/NetPlayIndex.cpp
View File

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

2
Source/Core/UICommon/ResourcePack/Manifest.cpp
View File

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