diff --git a/SConstruct b/SConstruct index 91619c6..5283f44 100644 --- a/SConstruct +++ b/SConstruct @@ -13,9 +13,13 @@ env = SConscript("./godot-cpp/SConstruct") # - LINKFLAGS are for linking flags # tweak this if you want to use different folders, or more folders, to store your source code in. -env.Append(CPPPATH=["src/"]) -sources = Glob("src/*.cpp") +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"]) + +sources = Glob("src/*.cpp") if env["platform"] == "macos": library = env.SharedLibrary( "project/addons/discord-rpc-gd/bin/libgd-discordrpc.{}.{}.framework/discord-rpc-gd.{}.{}".format( @@ -29,4 +33,5 @@ else: source=sources, ) + Default(library) diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so deleted file mode 100755 index ac9f6f3..0000000 Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.linux.template_debug.x86_64.so and /dev/null differ diff --git a/project/main.tscn b/project/main.tscn index 3b5d76e..79849d6 100644 --- a/project/main.tscn +++ b/project/main.tscn @@ -8,3 +8,9 @@ offset_bottom = 29.0 text = "Click me!" [node name="DiscordRPC" type="DiscordRPC" parent="."] +_import_path = NodePath("") +unique_name_in_owner = false +process_mode = 0 +process_priority = 0 +editor_description = "" +script = null diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle b/src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle new file mode 100644 index 0000000..3402426 Binary files /dev/null and b/src/discord-game-sdk-cpp/lib/discord_game_sdk.bundle differ diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll new file mode 100644 index 0000000..be946ea Binary files /dev/null and b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll differ diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib new file mode 100644 index 0000000..562b01c Binary files /dev/null and b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dll.lib differ diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib new file mode 100644 index 0000000..3402426 Binary files /dev/null and b/src/discord-game-sdk-cpp/lib/discord_game_sdk.dylib differ diff --git a/src/discord-game-sdk-cpp/lib/discord_game_sdk.so b/src/discord-game-sdk-cpp/lib/discord_game_sdk.so new file mode 100644 index 0000000..9dacf94 Binary files /dev/null and b/src/discord-game-sdk-cpp/lib/discord_game_sdk.so differ diff --git a/src/main.cpp b/src/main.cpp index 100a0f5..1b560ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,10 +21,10 @@ DiscordRPC::~DiscordRPC() { } void DiscordRPC::_ready() { - UtilityFunctions::print(core); discord::Result res /*= Core::Create(53908232506183680, DiscordCreateFlags_NoRequireDiscord, &core)*/; - /*Activity activity{}; - activity.SetState("Testing"); + Activity activity{}; + UtilityFunctions::print(core); + /*activity.SetState("Testing"); activity.SetDetails("Fruit Loops"); core->ActivityManager().UpdateActivity(activity, [](Result res) { });*/