vaporvee/discord-rpc-godot
1
2
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases 20 Wiki Activity

should fix crosscompiling

Browse Source
This commit is contained in:
Yannik
2023-04-27 18:31:30 +02:00
parent 3006747b44
commit f2f1092b2a
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -14,7 +14,6 @@
build/ build/
#Cleanup unused build files #Cleanup unused build files
*obj *.obj
*obj *.exp
*exp *.lib
*lib

6
SConstruct
View File

@@ -6,11 +6,11 @@ env = SConscript("godot-cpp/SConstruct")
# Check our platform specifics # Check our platform specifics
if env['platform'] == "macos": if env['platform'] == "macos":
discord_library = 'discord_game_sdk.dylib' discord_library = 'libdiscord_game_sdk.dylib'
libexportfolder = "/macos/" libexportfolder = "/macos/"
elif env['platform'] in ('linuxbsd', 'linux'): elif env['platform'] in ('linuxbsd', 'linux'):
discord_library = 'discord_game_sdk.so' discord_library = 'libdiscord_game_sdk.so'
libexportfolder = "/linux/" libexportfolder = "/linux/"
elif env['platform'] == "windows": elif env['platform'] == "windows":
@@ -27,7 +27,7 @@ else:
env.Append(LIBPATH=["lib/discord-game-sdk/"]) env.Append(LIBPATH=["lib/discord-game-sdk/"])
sources = Glob('src/discord-game-sdk-cpp/*.cpp') sources = Glob('src/discord-game-sdk-cpp/*.cpp')
env.Append(CPPPATH=['src/discord-game-sdk-cpp']) env.Append(CPPPATH=['src/discord-game-sdk-cpp'])
env.Append(LIBS=[discord_library.replace(".dll", "")]) env.Append(LIBS=["discord_game_sdk"])
# tweak this if you want to use different folders, or more folders, to store your source code in. # tweak this if you want to use different folders, or more folders, to store your source code in.
env.Append(CPPPATH=['src/']) env.Append(CPPPATH=['src/'])

0
lib/discord-game-sdk/discord_game_sdk.dylib → lib/discord-game-sdk/libdiscord_game_sdk.dylib
View File

0
lib/discord-game-sdk/discord_game_sdk.so → lib/discord-game-sdk/libdiscord_game_sdk.so
View File

32
project/addons/discord-sdk-gd/discord-rpc-gd.gdextension
View File

@@ -4,26 +4,26 @@ entry_symbol = "discordsdkgd_library_init"
[libraries] [libraries]
macos.debug = "bin/macos/discord_game_sdk_binding_debug.framework" macos.debug = "bin/macos/libdiscord_game_sdk_binding_debug.dylib"
macos.release = "bin/macos/discord_game_sdk_binding.framework" macos.release = "bin/macos/libdiscord_game_sdk_binding.dylib"
windows.debug.x86_64 = "bin/windows/discord_game_sdk_binding_debug.dll" windows.debug.x86_64 = "bin/windows/discord_game_sdk_binding_debug.dll"
windows.release.x86_64 = "bin/windows/discord_game_sdk_binding.dll" windows.release.x86_64 = "bin/windows/discord_game_sdk_binding.dll"
linux.debug.x86_64 = "bin/linux/discord_game_sdk_binding_debug.so" linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk_binding_debug.so"
linux.release.x86_64 = "bin/linux/discord_game_sdk_binding.so" linux.release.x86_64 = "bin/linux/libdiscord_game_sdk_binding.so"
linux.debug.arm64 = "bin/linux/discord_game_sdk_binding_debug.so" linux.debug.arm64 = "bin/linux/libdiscord_game_sdk_binding_debug.so"
linux.release.arm64 = "bin/linux/discord_game_sdk_binding.so" linux.release.arm64 = "bin/linux/libdiscord_game_sdk_binding.so"
linux.debug.rv64 = "bin/linux/discord_game_sdk_binding_debug.so" linux.debug.rv64 = "bin/linux/libdiscord_game_sdk_binding_debug.so"
linux.release.rv64 = "bin/linux/discord_game_sdk_binding.so" linux.release.rv64 = "bin/linux/libdiscord_game_sdk_binding.so"
[dependencies] [dependencies]
macos.debug = "bin/macos/discord_game_sdk.framework" macos.debug = "bin/macos/libdiscord_game_sdk.dylib"
macos.release = "bin/macos/discord_game_sdk.framework" macos.release = "bin/macos/libdiscord_game_sdk.dylib"
windows.debug.x86_64 = "bin/windows/discord_game_sdk.dll" windows.debug.x86_64 = "bin/windows/discord_game_sdk.dll"
windows.release.x86_64 = "bin/windows/discord_game_sdk.dll" windows.release.x86_64 = "bin/windows/discord_game_sdk.dll"
linux.debug.x86_64 = "bin/linux/discord_game_sdk.so" linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk.so"
linux.release.x86_64 = "bin/linux/discord_game_sdk.so" linux.release.x86_64 = "bin/linux/libdiscord_game_sdk.so"
linux.debug.arm64 = "bin/linux/discord_game_sdk.so" linux.debug.arm64 = "bin/linux/libdiscord_game_sdk.so"
linux.release.arm64 = "bin/linux/discord_game_sdk.so" linux.release.arm64 = "bin/linux/libdiscord_game_sdk.so"
linux.debug.rv64 = "bin/linux/ldiscord_game_sdk.so" linux.debug.rv64 = "bin/linux/libdiscord_game_sdk.so"
linux.release.rv64 = "bin/linux/discord_game_sdk.so" linux.release.rv64 = "bin/linux/libdiscord_game_sdk.so"

4
project/addons/discord-sdk-gd/export.gd
View File

@@ -5,6 +5,6 @@ func _export_file(path, type, features):
if features[2] == "windows": if features[2] == "windows":
add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/") add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/")
elif features[2] == "linux": elif features[2] == "linux":
add_shared_object("res://addons/discord-sdk-gd/bin/linux/discord_game_sdk.so",[],"/") add_shared_object("res://addons/discord-sdk-gd/bin/linux/libdiscord_game_sdk.so",[],"/")
elif features[2] == "macos": elif features[2] == "macos":
add_shared_object("res://addons/discord-sdk-gd/bin/macos/discord_game_sdk.dylib",[],"/") add_shared_object("res://addons/discord-sdk-gd/bin/macos/libdiscord_game_sdk.dylib",[],"/")