diff --git a/.gitignore b/.gitignore index aab5efc..86f8e35 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ build/ #Cleanup unused build files -*obj -*obj -*exp -*lib \ No newline at end of file +*.obj +*.exp +*.lib \ No newline at end of file diff --git a/SConstruct b/SConstruct index c2c4a3e..45c544a 100644 --- a/SConstruct +++ b/SConstruct @@ -6,11 +6,11 @@ env = SConscript("godot-cpp/SConstruct") # Check our platform specifics if env['platform'] == "macos": - discord_library = 'discord_game_sdk.dylib' + discord_library = 'libdiscord_game_sdk.dylib' libexportfolder = "/macos/" elif env['platform'] in ('linuxbsd', 'linux'): - discord_library = 'discord_game_sdk.so' + discord_library = 'libdiscord_game_sdk.so' libexportfolder = "/linux/" elif env['platform'] == "windows": @@ -27,7 +27,7 @@ else: env.Append(LIBPATH=["lib/discord-game-sdk/"]) sources = Glob('src/discord-game-sdk-cpp/*.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. env.Append(CPPPATH=['src/']) diff --git a/lib/discord-game-sdk/discord_game_sdk.dylib b/lib/discord-game-sdk/libdiscord_game_sdk.dylib similarity index 100% rename from lib/discord-game-sdk/discord_game_sdk.dylib rename to lib/discord-game-sdk/libdiscord_game_sdk.dylib diff --git a/lib/discord-game-sdk/discord_game_sdk.so b/lib/discord-game-sdk/libdiscord_game_sdk.so similarity index 100% rename from lib/discord-game-sdk/discord_game_sdk.so rename to lib/discord-game-sdk/libdiscord_game_sdk.so diff --git a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension index 87a2e00..360b36b 100644 --- a/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension +++ b/project/addons/discord-sdk-gd/discord-rpc-gd.gdextension @@ -4,26 +4,26 @@ entry_symbol = "discordsdkgd_library_init" [libraries] -macos.debug = "bin/macos/discord_game_sdk_binding_debug.framework" -macos.release = "bin/macos/discord_game_sdk_binding.framework" +macos.debug = "bin/macos/libdiscord_game_sdk_binding_debug.dylib" +macos.release = "bin/macos/libdiscord_game_sdk_binding.dylib" windows.debug.x86_64 = "bin/windows/discord_game_sdk_binding_debug.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.release.x86_64 = "bin/linux/discord_game_sdk_binding.so" -linux.debug.arm64 = "bin/linux/discord_game_sdk_binding_debug.so" -linux.release.arm64 = "bin/linux/discord_game_sdk_binding.so" -linux.debug.rv64 = "bin/linux/discord_game_sdk_binding_debug.so" -linux.release.rv64 = "bin/linux/discord_game_sdk_binding.so" +linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk_binding_debug.so" +linux.release.x86_64 = "bin/linux/libdiscord_game_sdk_binding.so" +linux.debug.arm64 = "bin/linux/libdiscord_game_sdk_binding_debug.so" +linux.release.arm64 = "bin/linux/libdiscord_game_sdk_binding.so" +linux.debug.rv64 = "bin/linux/libdiscord_game_sdk_binding_debug.so" +linux.release.rv64 = "bin/linux/libdiscord_game_sdk_binding.so" [dependencies] -macos.debug = "bin/macos/discord_game_sdk.framework" -macos.release = "bin/macos/discord_game_sdk.framework" +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/discord_game_sdk.so" -linux.release.x86_64 = "bin/linux/discord_game_sdk.so" -linux.debug.arm64 = "bin/linux/discord_game_sdk.so" -linux.release.arm64 = "bin/linux/discord_game_sdk.so" -linux.debug.rv64 = "bin/linux/ldiscord_game_sdk.so" -linux.release.rv64 = "bin/linux/discord_game_sdk.so" \ No newline at end of file +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 diff --git a/project/addons/discord-sdk-gd/export.gd b/project/addons/discord-sdk-gd/export.gd index 5ef7180..7e83dae 100644 --- a/project/addons/discord-sdk-gd/export.gd +++ b/project/addons/discord-sdk-gd/export.gd @@ -5,6 +5,6 @@ func _export_file(path, type, features): if features[2] == "windows": add_shared_object("res://addons/discord-sdk-gd/bin/windows/discord_game_sdk.dll",[],"/") 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": - 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",[],"/")