From aa39fb80e09bf1d1ee7369bd842c04b303e453b4 Mon Sep 17 00:00:00 2001 From: vaartis Date: Fri, 30 Jun 2023 19:35:35 +0300 Subject: [PATCH 1/2] Change gdextension dependencies so they're actually used This part isn't very well documented, but they changed the format of that file at some point and now it needs to be like this to pull the dependencies into the built project. Assuming this is what the export plugin does, that can probably be removed. --- .../discord-sdk-gd/discord-rpc-gd.gdextension | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension index 360b36b..abe5d9b 100644 --- a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension +++ b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension @@ -17,13 +17,13 @@ linux.release.rv64 = "bin/linux/libdiscord_game_sdk_binding.so" [dependencies] -macos.debug = "bin/macos/libdiscord_game_sdk.dylib" -macos.release = "bin/macos/libdiscord_game_sdk.dylib" -windows.debug.x86_64 = "bin/windows/discord_game_sdk.dll" -windows.release.x86_64 = "bin/windows/discord_game_sdk.dll" -linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk.so" -linux.release.x86_64 = "bin/linux/libdiscord_game_sdk.so" -linux.debug.arm64 = "bin/linux/libdiscord_game_sdk.so" -linux.release.arm64 = "bin/linux/libdiscord_game_sdk.so" -linux.debug.rv64 = "bin/linux/libdiscord_game_sdk.so" -linux.release.rv64 = "bin/linux/libdiscord_game_sdk.so" \ No newline at end of file +macos.debug = { "bin/macos/libdiscord_game_sdk.dylib": "" } +macos.release = { "bin/macos/libdiscord_game_sdk.dylib": "" } +windows.debug.x86_64 = { "bin/windows/discord_game_sdk.dll": "" } +windows.release.x86_64 = { "bin/windows/discord_game_sdk.dll": "" } +linux.debug.x86_64 = { "bin/linux/libdiscord_game_sdk.so": "" } +linux.release.x86_64 = { "bin/linux/libdiscord_game_sdk.so": "" } +linux.debug.arm64 = { "bin/linux/libdiscord_game_sdk.so": "" } +linux.release.arm64 = { "bin/linux/libdiscord_game_sdk.so": "" } +linux.debug.rv64 = { "bin/linux/libdiscord_game_sdk.so": "" } +linux.release.rv64 = { "bin/linux/libdiscord_game_sdk.so": "" } -- 2.49.1 From 6f288564cfd927dc32e24e6d93708d7c27683bd4 Mon Sep 17 00:00:00 2001 From: Ekaterina Vaartis Date: Fri, 30 Jun 2023 20:46:48 +0300 Subject: [PATCH 2/2] Patch the SDK in setup.py so it actually builds --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.py b/setup.py index b34f8e8..1be2156 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,12 @@ import os with zipfile.ZipFile("src/lib/discord_game_sdk.zip", "r") as zip_ref: zip_ref.extractall("src/lib/discord_game_sdk/") +# Patch the SDK to actually build, since it's missing an include +with open("src/lib/discord_game_sdk/cpp/types.h", "r+") as f: + s = f.read(); + f.seek(0); + f.write("#include \n" + s) + copy_tree("src/lib/discord_game_sdk/lib/", "src/lib/discord_game_sdk/bin/") os.rename( "src/lib/discord_game_sdk/bin/aarch64/discord_game_sdk.dylib", -- 2.49.1