Platform whitelist, mac support, compilation fix.

examples/unrealstatus/Plugins/DiscordRpc/DiscordRpc.uplugin

@@ -17,7 +17,13 @@
 		{
 			"Name": "DiscordRpc",
 			"Type": "Runtime",
-			"LoadingPhase": "PreDefault"
+			"LoadingPhase": "PreDefault",
+			"WhitelistPlatforms" :
+            [
+                "Win64",
+				"Linux",
+				"Mac"
+            ]
 		}
 	]
 }

examples/unrealstatus/Plugins/DiscordRpc/Source/DiscordRpc/DiscordRpc.Build.cs

@@ -1,10 +1,15 @@
 // Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
 
 using UnrealBuildTool;
+using System.IO;
 
-public class discordrpc : ModuleRules
+public class DiscordRpc : ModuleRules
 {
-    public discordrpc(ReadOnlyTargetRules Target) : base(Target)
+#if WITH_FORWARDED_MODULE_RULES_CTOR
+    public DiscordRpc(ReadOnlyTargetRules Target) : base(Target)
+#else
+    public DiscordRpc(TargetInfo Target)
+#endif
     {
         Definitions.Add("DISCORD_DYNAMIC_LIB=1");
 
@@ -24,6 +29,7 @@ public class discordrpc : ModuleRules
             new string[]
             {
                 "Core",
+                "DiscordRpcLibrary"
             }
             );
 
@@ -45,7 +51,7 @@ public class discordrpc : ModuleRules
 			}
             );
 
-        string BaseDirectory = Path.GetFullPath(Path.Combine(ModuleDirectory, "..", "..", "ThirdParty", "DiscordRpcLibrary"));
+        string BaseDirectory = Path.GetFullPath(Path.Combine(ModuleDirectory, "..", "..", "Source", "ThirdParty", "DiscordRpcLibrary"));
         PublicIncludePaths.Add(Path.Combine(BaseDirectory, "Include"));
     }
 }

examples/unrealstatus/Plugins/DiscordRpc/Source/DiscordRpc/Private/DiscordRpc.cpp

@@ -12,7 +12,7 @@ void FDiscordRpcModule::StartupModule()
 #if defined(DISCORD_DYNAMIC_LIB)
     // Get the base directory of this plugin
     FString BaseDir = IPluginManager::Get().FindPlugin("DiscordRpc")->GetBaseDir();
-	const FString SDKDir = FPaths::Combine(*BaseDir, TEXT("ThirdParty"), TEXT("DiscordRpcLibrary"));
+	const FString SDKDir = FPaths::Combine(*BaseDir, TEXT("Source"), TEXT("ThirdParty"), TEXT("DiscordRpcLibrary"));
 #if PLATFORM_WINDOWS
 	const FString LibName = TEXT("discord-rpc");
 	const FString LibDir = FPaths::Combine(*SDKDir, TEXT("Win64"));
@@ -42,7 +42,7 @@ void FDiscordRpcModule::ShutdownModule()
 #endif
 }
 
-bool FDiscordAPIModule::LoadDependency(const FString& Dir, const FString& Name, void*& Handle)
+bool FDiscordRpcModule::LoadDependency(const FString& Dir, const FString& Name, void*& Handle)
 {
 	FString Lib = Name + TEXT(".") + FPlatformProcess::GetModuleExtension();
 	FString Path = Dir.IsEmpty() ? *Lib : FPaths::Combine(*Dir, *Lib);
@@ -57,7 +57,7 @@ bool FDiscordAPIModule::LoadDependency(const FString& Dir, const FString& Name,
 	return true;
 }
 
-void FDiscordAPIModule::FreeDependency(void*& Handle)
+void FDiscordRpcModule::FreeDependency(void*& Handle)
 {
 	if (Handle != nullptr)
 	{

examples/unrealstatus/Plugins/DiscordRpc/Source/DiscordRpc/Private/DiscordRpcBlueprint.cpp

@@ -1,4 +1,4 @@
-#include "DicordRpcPrivatePCH"
+#include "DiscordRpcPrivatePCH.h"
 #include "DiscordRpcBlueprint.h"
 #include "discord-rpc.h"
 

examples/unrealstatus/Plugins/DiscordRpc/Source/DiscordRpc/Public/DiscordRpc.h

@@ -12,7 +12,7 @@ public:
 
 private:
     /** Handle to the test dll we will load */
-    void* DiscordLibraryHandle;
+    void* DiscordRpcLibraryHandle;
 	
 	/** StartupModule is covered with defines, these functions are the place to put breakpoints */
 	static bool LoadDependency(const FString& Dir, const FString& Name, void*& Handle);

examples/unrealstatus/Plugins/DiscordRpc/Source/ThirdParty/DiscordRpcLibrary/DiscordRpcLibrary.Build.cs

@@ -3,14 +3,18 @@
 using System.IO;
 using UnrealBuildTool;
 
-public class discordrpcLibrary : ModuleRules
+public class DiscordRpcLibrary : ModuleRules
 {
-    public discordrpcLibrary(ReadOnlyTargetRules Target) : base(Target)
+#if WITH_FORWARDED_MODULE_RULES_CTOR
+    public DiscordRpcLibrary(ReadOnlyTargetRules Target) : base(Target)
+#else
+    public DiscordRpcLibrary(TargetInfo Target)
+#endif
     {
         Type = ModuleType.External;
         Definitions.Add("DISCORD_DYNAMIC_LIB=1");
 
-        string BaseDirectory = Path.GetFullPath(Path.Combine(ModuleDirectory, "..", "..", "ThirdParty", "discordrpc"));
+        string BaseDirectory = Path.GetFullPath(Path.Combine(ModuleDirectory, "..", "..", "ThirdParty", "DiscordRpcLibrary"));
 
         if (Target.Platform == UnrealTargetPlatform.Win64)
         {
@@ -39,5 +43,17 @@ public class discordrpcLibrary : ModuleRules
             PublicAdditionalLibraries.Add(Path.Combine(lib, "libdiscord-rpc.so"));
             RuntimeDependencies.Add(new RuntimeDependency(Path.Combine(lib, "libdiscord-rpc.so")));
         }
+        else if (Target.Platform == UnrealTargetPlatform.Mac)
+        {
+            string lib = Path.Combine(BaseDirectory, "Mac");
+
+            // Include headers
+            PublicIncludePaths.Add(Path.Combine(BaseDirectory, "Include"));
+
+            // Add the import library
+            PublicLibraryPaths.Add(lib);
+            PublicAdditionalLibraries.Add(Path.Combine(lib, "libdiscord-rpc.dylib"));
+            RuntimeDependencies.Add(new RuntimeDependency(Path.Combine(lib, "libdiscord-rpc.dylib")));
+        }
     }
 }

examples/unrealstatus/Plugins/DiscordRpc/Source/ThirdParty/DiscordRpcLibrary/Include/discord-rpc.h

@@ -49,7 +49,7 @@ typedef struct DiscordJoinRequest {
 } DiscordJoinRequest;
 
 typedef struct DiscordEventHandlers {
-    void (*ready)();
+    void (*ready)(void);
     void (*disconnected)(int errorCode, const char* message);
     void (*errored)(int errorCode, const char* message);
     void (*joinGame)(const char* joinSecret);
@@ -76,6 +76,7 @@ DISCORD_EXPORT void Discord_UpdateConnection(void);
 #endif
 
 DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
+DISCORD_EXPORT void Discord_ClearPresence(void);
 
 DISCORD_EXPORT void Discord_Respond(const char* userid, /* DISCORD_REPLY_ */ int reply);