From ff24776107553b346743eecce6004a6a92a5d961 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Wed, 9 Aug 2017 14:35:52 -0700 Subject: [PATCH] More plugin --- examples/unrealstatus/.gitignore | 2 +- .../unrealstatus/Config/DefaultEngine.ini | 8 ++++++-- .../unrealstatus/Content/ShowTheUILevel.umap | Bin 662314 -> 636062 bytes .../Source/discordrpc/Private/discordrpc.cpp | 16 +++++----------- .../Source/discordrpc/Public/discordrpc.h | 2 +- .../Source/discordrpc/discordrpc.Build.cs | 7 ++++--- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/examples/unrealstatus/.gitignore b/examples/unrealstatus/.gitignore index e2936de..ad5d402 100644 --- a/examples/unrealstatus/.gitignore +++ b/examples/unrealstatus/.gitignore @@ -72,4 +72,4 @@ Saved/* Intermediate/ # Cache files for the editor to use -DerivedDataCache/* \ No newline at end of file +DerivedDataCache/ diff --git a/examples/unrealstatus/Config/DefaultEngine.ini b/examples/unrealstatus/Config/DefaultEngine.ini index 797c758..84c38f3 100644 --- a/examples/unrealstatus/Config/DefaultEngine.ini +++ b/examples/unrealstatus/Config/DefaultEngine.ini @@ -6,6 +6,9 @@ AppliedTargetedHardwareClass=Desktop DefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum +[/Script/Engine.EndUserSettings] +bSendAnonymousUsageDataToEpic=False + [/Script/Engine.PhysicsSettings] DefaultGravityZ=-980.000000 DefaultTerminalVelocity=4000.000000 @@ -45,6 +48,7 @@ SyncSceneSmoothingFactor=0.000000 AsyncSceneSmoothingFactor=0.990000 InitialAverageFrameRate=0.016667 -[/Script/Engine.EndUserSettings] -bSendAnonymousUsageDataToEpic=False +[/Script/EngineSettings.GameMapsSettings] +EditorStartupMap=/Game/ShowTheUILevel.ShowTheUILevel +GameDefaultMap=/Game/ShowTheUILevel.ShowTheUILevel diff --git a/examples/unrealstatus/Content/ShowTheUILevel.umap b/examples/unrealstatus/Content/ShowTheUILevel.umap index 6be7fba026f453e91c5efa8b95b800be96f7d5be..b0c51c245913f02095b9ff2ec438a938dd73ecdb 100644 GIT binary patch delta 15839 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 QM=~89@7=LE<@=of2ad#2Jpcdz diff --git a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Private/discordrpc.cpp b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Private/discordrpc.cpp index 7721f7f..132fa23 100644 --- a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Private/discordrpc.cpp +++ b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Private/discordrpc.cpp @@ -5,8 +5,6 @@ #include "ModuleManager.h" #include "IPluginManager.h" -#define DISCORD_DYNAMIC_LIB -//#include "../../../../../../../include/discord-rpc.h" #include "discord-rpc.h" #define LOCTEXT_NAMESPACE "FdiscordrpcModule" @@ -26,15 +24,11 @@ void FdiscordrpcModule::StartupModule() LibraryPath = FPaths::Combine(*BaseDir, TEXT("Source/ThirdParty/discordrpcLibrary/Mac/Release/libdiscord-rpc.dylib")); #endif // PLATFORM_WINDOWS - ExampleLibraryHandle = !LibraryPath.IsEmpty() ? FPlatformProcess::GetDllHandle(*LibraryPath) : nullptr; + DiscordLibraryHandle = !LibraryPath.IsEmpty() ? FPlatformProcess::GetDllHandle(*LibraryPath) : nullptr; - if (ExampleLibraryHandle) + if (!DiscordLibraryHandle) { - Discord_Initialize("344609418631053312", nullptr, false); - } - else - { - FMessageDialog::Open(EAppMsgType::Ok, LOCTEXT("ThirdPartyLibraryError", "Failed to load example third party library")); + FMessageDialog::Open(EAppMsgType::Ok, LOCTEXT("ThirdPartyLibraryError", "Failed to load discord-rpc library")); } } @@ -44,8 +38,8 @@ void FdiscordrpcModule::ShutdownModule() // we call this function before unloading the module. // Free the dll handle - FPlatformProcess::FreeDllHandle(ExampleLibraryHandle); - ExampleLibraryHandle = nullptr; + FPlatformProcess::FreeDllHandle(DiscordLibraryHandle); + DiscordLibraryHandle = nullptr; } #undef LOCTEXT_NAMESPACE diff --git a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Public/discordrpc.h b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Public/discordrpc.h index f9a7af3..d57a91c 100644 --- a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Public/discordrpc.h +++ b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/Public/discordrpc.h @@ -14,5 +14,5 @@ public: private: /** Handle to the test dll we will load */ - void* ExampleLibraryHandle; + void* DiscordLibraryHandle; }; \ No newline at end of file diff --git a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/discordrpc.Build.cs b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/discordrpc.Build.cs index 698b809..7d9af83 100644 --- a/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/discordrpc.Build.cs +++ b/examples/unrealstatus/Plugins/discordrpc/Source/discordrpc/discordrpc.Build.cs @@ -6,8 +6,9 @@ public class discordrpc : ModuleRules { public discordrpc(ReadOnlyTargetRules Target) : base(Target) { - PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; - + Definitions.Add("DISCORD_DYNAMIC_LIB=1"); + PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; + PublicIncludePaths.AddRange( new string[] { "discordrpc/Public" @@ -26,7 +27,7 @@ public class discordrpc : ModuleRules PublicLibraryPaths.AddRange( new string[] { - "Binaries/ThirdParty/discordrpcLibrary/Win64", + System.IO.Path.Combine(ModuleDirectory, "../../Binaries/ThirdParty/discordrpcLibrary/", Target.Platform.ToString()), } );