diff --git a/SConstruct b/SConstruct index 5283f44..e8d4286 100644 --- a/SConstruct +++ b/SConstruct @@ -14,10 +14,9 @@ env = SConscript("./godot-cpp/SConstruct") # tweak this if you want to use different folders, or more folders, to store your source code in. -env.Append(CPPPATH=["src/","src/discord-game-sdk-cpp"]) - -env.Append(LIBPATH=[ "./godot-cpp/bin", "src/discord-game-sdk-cpp/lib"]) -env.Append(LIBS=[ "libgodot-cpp{}{}".format(env["suffix"], env["SHLIBSUFFIX"]), "discord_game_sdk"]) +env.Append(CPPPATH=["src/"]) +env.Append(LIBS=["discord_game_sdk"]) +env.Append(LIBPATH=["project/addons/discord-rpc-gd/lib"]) sources = Glob("src/*.cpp") if env["platform"] == "macos": diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll new file mode 100644 index 0000000..2cca7ff Binary files /dev/null and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll differ diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp new file mode 100644 index 0000000..ff55646 Binary files /dev/null and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp differ diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib new file mode 100644 index 0000000..ee7f576 Binary files /dev/null and b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib differ diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle b/project/addons/discord-rpc-gd/lib/discord_game_sdk.bundle similarity index 100% rename from src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle rename to project/addons/discord-rpc-gd/lib/discord_game_sdk.bundle diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll b/project/addons/discord-rpc-gd/lib/discord_game_sdk.dll similarity index 100% rename from src/discord-game-sdk-cpp/lib/discord_game_sdk.dll rename to project/addons/discord-rpc-gd/lib/discord_game_sdk.dll diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib b/project/addons/discord-rpc-gd/lib/discord_game_sdk.dylib similarity index 100% rename from src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib rename to project/addons/discord-rpc-gd/lib/discord_game_sdk.dylib diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib b/project/addons/discord-rpc-gd/lib/discord_game_sdk.lib similarity index 100% rename from src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib rename to project/addons/discord-rpc-gd/lib/discord_game_sdk.lib diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.so b/project/addons/discord-rpc-gd/lib/discord_game_sdk.so similarity index 100% rename from src/discord-game-sdk-cpp/lib/discord_game_sdk.so rename to project/addons/discord-rpc-gd/lib/discord_game_sdk.so diff --git a/src/main.cpp b/src/main.cpp index 1b560ef..e7faeb0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,30 +6,34 @@ using namespace godot; using namespace discord; -Core* core{}; +Core *core{}; -void DiscordRPC::_bind_methods() { +void DiscordRPC::_bind_methods() +{ } -DiscordRPC::DiscordRPC() { +DiscordRPC::DiscordRPC() +{ // initialize any variables here time_passed = 0.0; } -DiscordRPC::~DiscordRPC() { +DiscordRPC::~DiscordRPC() +{ // add your cleanup here } -void DiscordRPC::_ready() { - discord::Result res /*= Core::Create(53908232506183680, DiscordCreateFlags_NoRequireDiscord, &core)*/; - Activity activity{}; +void DiscordRPC::_ready() +{ + /*discord::Result res = Core::Create(53908232506183680, DiscordCreateFlags_NoRequireDiscord, &core); + Activity activity{}; UtilityFunctions::print(core); - /*activity.SetState("Testing"); - activity.SetDetails("Fruit Loops"); - core->ActivityManager().UpdateActivity(activity, [](Result res) { - });*/ + activity.SetState("Testing"); + activity.SetDetails("Fruit Loops"); + core->ActivityManager().UpdateActivity(activity, [](Result res) {});*/ } -void DiscordRPC::_process(float delta) { +void DiscordRPC::_process(float delta) +{ //::core->RunCallbacks(); } \ No newline at end of file diff --git a/src/main.h b/src/main.h index 98eeecb..ef22c02 100644 --- a/src/main.h +++ b/src/main.h @@ -1,28 +1,29 @@ #ifndef DISCORDRPC_H #define DISCORDRPC_H - #include +#include "./discord-game-sdk-cpp/discord.h" -namespace godot { +namespace godot +{ -class DiscordRPC : public Node { - GDCLASS(DiscordRPC, Node) + class DiscordRPC : public Node + { + GDCLASS(DiscordRPC, Node) -private: - float time_passed; + private: + float time_passed; -protected: - static void _bind_methods(); + protected: + static void _bind_methods(); -public: - DiscordRPC(); - ~DiscordRPC(); + public: + DiscordRPC(); + ~DiscordRPC(); - void _ready(); - void _process(float delta); -}; + void _ready(); + void _process(float delta); + }; } - #endif \ No newline at end of file diff --git a/src/main.windows.template_debug.x86_64.obj b/src/main.windows.template_debug.x86_64.obj new file mode 100644 index 0000000..5d3ca62 Binary files /dev/null and b/src/main.windows.template_debug.x86_64.obj differ diff --git a/src/register_types.windows.template_debug.x86_64.obj b/src/register_types.windows.template_debug.x86_64.obj new file mode 100644 index 0000000..bfb53e4 Binary files /dev/null and b/src/register_types.windows.template_debug.x86_64.obj differ