Skip to content

Commit

Permalink
trying to fix macos support agaaaiiin -_-
Browse files Browse the repository at this point in the history
  • Loading branch information
vaporvee committed Jan 12, 2024
1 parent 2624507 commit 37c7759
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down
16 changes: 8 additions & 8 deletions project/addons/discord-sdk-gd/bin/discord-rpc-gd.gdextension
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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": "" }
Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
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",
Expand Down

0 comments on commit 37c7759

Please sign in to comment.