From 37c7759cdf60c4f52557b80ee65cba4c774da483 Mon Sep 17 00:00:00 2001
From: vaporvee <yannik@vaporvee.com>
Date: Fri, 12 Jan 2024 17:20:35 +0100
Subject: [PATCH] trying to fix macos support agaaaiiin -_-

---
 SConstruct                                       |  4 ++--
 .../bin/discord-rpc-gd.gdextension               | 16 ++++++++--------
 setup.py                                         |  6 +-----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/SConstruct b/SConstruct
index 384d739..70d4af9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,8 +4,8 @@ import os
 env = SConscript("src/lib/godot-cpp/SConstruct")
 
 if env["platform"] == "macos":
-    discord_library = "libdiscord_game_sdk.dylib"
-    discord_library_second = "libdiscord_game_sdk_aarch64.dylib"
+    discord_library = "discord_game_sdk.dylib"
+    discord_library_second = "discord_game_sdk_aarch64.dylib"
     libexportfolder = "/macos/"
 
 elif env["platform"] in ("linuxbsd", "linux"):
diff --git a/project/addons/discord-sdk-gd/bin/discord-rpc-gd.gdextension b/project/addons/discord-sdk-gd/bin/discord-rpc-gd.gdextension
index 1cdc0de..5c50c59 100644
--- a/project/addons/discord-sdk-gd/bin/discord-rpc-gd.gdextension
+++ b/project/addons/discord-sdk-gd/bin/discord-rpc-gd.gdextension
@@ -5,10 +5,10 @@ compatibility_minimum = 4.2
 
 [libraries]
 
-macos.debug.x86_64 = "macos/libdiscord_game_sdk_binding_debug.dylib"
-macos.release.x86_64 = "macos/libdiscord_game_sdk_binding.dylib"
-macos.debug.arm64 = "macos/libdiscord_game_sdk_binding_arm64_debug.dylib"
-macos.release.arm64 = "macos/libdiscord_game_sdk_binding_arm64.dylib"
+macos.debug.x86_64 = "macos/discord_game_sdk_binding_debug.dylib"
+macos.release.x86_64 = "macos/discord_game_sdk_binding.dylib"
+macos.debug.arm64 = "macos/discord_game_sdk_binding_arm64_debug.dylib"
+macos.release.arm64 = "macos/discord_game_sdk_binding_arm64.dylib"
 windows.debug.x86_64 = "windows/discord_game_sdk_binding_debug.dll"
 windows.release.x86_64 = "windows/discord_game_sdk_binding.dll"
 linux.debug.x86_64 = "linux/libdiscord_game_sdk_binding_debug.so"
@@ -20,10 +20,10 @@ linux.release.rv64 = "linux/libdiscord_game_sdk_binding.so"
 
 [dependencies]
 
-macos.debug.x86_64 = { "macos/libdiscord_game_sdk.dylib": "" }
-macos.release.x86_64 = { "macos/libdiscord_game_sdk.dylib": "" }
-macos.debug.arm64 = { "macos/libdiscord_game_sdk_aarch64": "" }
-macos.release.arm64 = { "macos/libdiscord_game_sdk_aarch64": "" }
+macos.debug.x86_64 = { "macos/discord_game_sdk.dylib": "" }
+macos.release.x86_64 = { "macos/discord_game_sdk.dylib": "" }
+macos.debug.arm64 = { "macos/discord_game_sdk_aarch64": "" }
+macos.release.arm64 = { "macos/discord_game_sdk_aarch64": "" }
 windows.debug.x86_64 = { "windows/discord_game_sdk.dll": "" }
 windows.release.x86_64 = { "windows/discord_game_sdk.dll": "" }
 linux.debug.x86_64 = { "linux/libdiscord_game_sdk.so": "" }
diff --git a/setup.py b/setup.py
index 7182e91..be43237 100644
--- a/setup.py
+++ b/setup.py
@@ -15,11 +15,7 @@ with open("src/lib/discord_game_sdk/cpp/types.h", "r+") as f:
 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",
-    "src/lib/discord_game_sdk/bin/aarch64/libdiscord_game_sdk_aarch64.dylib",
-)
-os.rename(
-    "src/lib/discord_game_sdk/bin/x86_64/discord_game_sdk.dylib",
-    "src/lib/discord_game_sdk/bin/x86_64/libdiscord_game_sdk.dylib",
+    "src/lib/discord_game_sdk/bin/aarch64/discord_game_sdk_aarch64.dylib",
 )
 os.rename(
     "src/lib/discord_game_sdk/bin/x86_64/discord_game_sdk.so",