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

implemented scons for social sdk

Browse Source
This commit is contained in:
Yannik
2025-03-19 13:38:33 +01:00
parent 8edabeddf8
commit 185f295ffb
8 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
SConstruct
View File

@@ -3,46 +3,38 @@ import os
env = SConscript("src/lib/godot-cpp/SConstruct") env = SConscript("src/lib/godot-cpp/SConstruct")
env.Append(CPPPATH=["src/"])
sources = Glob("src/*.cpp")
if env["platform"] == "macos": if env["platform"] == "macos":
discord_library = "libdiscord_game_sdk.dylib" discord_library = "libdiscord_partner_sdk.dylib"
discord_library_second = ""
libexportfolder = "/macos/" libexportfolder = "/macos/"
elif env["platform"] in ("linuxbsd", "linux"): elif env["platform"] in ("linuxbsd", "linux"):
discord_library = "libdiscord_game_sdk.so" discord_library = "libdiscord_partner_sdk.so"
discord_library_second = ""
libexportfolder = "/linux/" libexportfolder = "/linux/"
elif env["platform"] == "windows": elif env["platform"] == "windows":
discord_library = "discord_game_sdk.dll" discord_library = "discord_partner_sdk.dll"
discord_library_second = "discord_game_sdk_x86.dll"
libexportfolder = "/windows/" libexportfolder = "/windows/"
if env["target"] == "template_debug": if env["target"] == "template_debug":
debugsuffix = "_debug" debugsuffix = "_debug"
folder = "debug/"
else: else:
debugsuffix = "" debugsuffix = ""
folder = "release/" #
if env.get("arch") == "arm64":
armsuffix = "_arm64"
else:
armsuffix = ""
env.Append(LIBPATH=["src/lib/discord_game_sdk/bin/"]) env.Append(LIBPATH=["src/lib/discord_social_sdk/lib/" + folder])
sources = Glob("src/lib/discord_game_sdk/cpp/*.cpp") env.Append(LIBS=["discord_partner_sdk"])
env.Append(CPPPATH=["src/lib/discord_game_sdk/cpp/"])
env.Append(LIBS=["discord_game_sdk"])
env.Append(CPPPATH=["src/"])
sources += Glob("src/*.cpp")
env.Append(CPPDEFINES=["HOT_RELOAD_ENABLED"]) env.Append(CPPDEFINES=["HOT_RELOAD_ENABLED"])
library = env.SharedLibrary( library = env.SharedLibrary(
target="project/addons/discord-rpc-gd/bin/" target="project/addons/discord-rpc-gd/bin/"
+ libexportfolder + libexportfolder
+ "discord_game_sdk_binding" + "discord_partner_sdk_binding"
+ armsuffix
+ debugsuffix, + debugsuffix,
source=sources, source=sources,
) )
@@ -50,20 +42,9 @@ env.Depends(
library, library,
Command( Command(
"project/addons/discord-rpc-gd/bin/" + libexportfolder + discord_library, "project/addons/discord-rpc-gd/bin/" + libexportfolder + discord_library,
"src/lib/discord_game_sdk/bin/" + discord_library, "src/lib/discord_partner_sdk/bin/" + folder + discord_library,
Copy("$TARGET", "$SOURCE"), Copy("$TARGET", "$SOURCE"),
), ),
) )
if discord_library_second != "":
env.Depends(
library,
Command(
"project/addons/discord-rpc-gd/bin/"
+ libexportfolder
+ discord_library_second,
"src/lib/discord_game_sdk/bin/" + discord_library_second,
Copy("$TARGET", "$SOURCE"),
),
)
Default(library) Default(library)

4
build.py
View File

@@ -31,10 +31,10 @@ elif choice in no:
cur_working_dir = os.path.dirname(os.path.realpath(__file__)) + '/project/addons/discord-rpc-gd/bin/macos/' cur_working_dir = os.path.dirname(os.path.realpath(__file__)) + '/project/addons/discord-rpc-gd/bin/macos/'
os.chdir(cur_working_dir) os.chdir(cur_working_dir)
os.system( os.system(
"lipo -create libdiscord_game_sdk_binding_arm64_debug.dylib libdiscord_game_sdk_binding_debug.dylib -output libdiscord_game_sdk_binding_debug.dylib" "lipo -create libdiscord_partner_sdk_binding_arm64_debug.dylib libdiscord_partner_sdk_binding_debug.dylib -output libdiscord_partner_sdk_binding_debug.dylib"
) )
os.system( os.system(
"lipo -create libdiscord_game_sdk_binding_arm64.dylib libdiscord_game_sdk_binding.dylib -output libdiscord_game_sdk_binding.dylib" "lipo -create libdiscord_partner_sdk_binding_arm64.dylib libdiscord_partner_sdk_binding.dylib -output libdiscord_partner_sdk_binding.dylib"
) )
else: # Linux else: # Linux
os.system( os.system(

38
project/addons/discord-rpc-gd/bin/discord-rpc-gd.gdextension
View File

@@ -5,25 +5,25 @@ compatibility_minimum = 4.1
[libraries] [libraries]
macos.debug = "macos/libdiscord_game_sdk_binding_debug.dylib" macos.debug = "macos/libdiscord_partner_sdk_binding_debug.dylib"
macos.release = "macos/libdiscord_game_sdk_binding.dylib" macos.release = "macos/libdiscord_partner_sdk_binding.dylib"
windows.debug.x86_64 = "windows/discord_game_sdk_binding_debug.dll" windows.debug.x86_64 = "windows/discord_partner_sdk_binding_debug.dll"
windows.release.x86_64 = "windows/discord_game_sdk_binding.dll" windows.release.x86_64 = "windows/discord_partner_sdk_binding.dll"
linux.debug.x86_64 = "linux/libdiscord_game_sdk_binding_debug.so" linux.debug.x86_64 = "linux/libdiscord_partner_sdk_binding_debug.so"
linux.release.x86_64 = "linux/libdiscord_game_sdk_binding.so" linux.release.x86_64 = "linux/libdiscord_partner_sdk_binding.so"
linux.debug.arm64 = "linux/libdiscord_game_sdk_binding_debug.so" linux.debug.arm64 = "linux/libdiscord_partner_sdk_binding_debug.so"
linux.release.arm64 = "linux/libdiscord_game_sdk_binding.so" linux.release.arm64 = "linux/libdiscord_partner_sdk_binding.so"
linux.debug.rv64 = "linux/libdiscord_game_sdk_binding_debug.so" linux.debug.rv64 = "linux/libdiscord_partner_sdk_binding_debug.so"
linux.release.rv64 = "linux/libdiscord_game_sdk_binding.so" linux.release.rv64 = "linux/libdiscord_partner_sdk_binding.so"
[dependencies] [dependencies]
macos = { "macos/libdiscord_game_sdk.dylib": "" } macos = { "macos/libdiscord_partner_sdk.dylib": "" }
windows.debug.x86_64 = { "windows/discord_game_sdk.dll": "" } windows.debug.x86_64 = { "windows/discord_partner_sdk.dll": "" }
windows.release.x86_64 = { "windows/discord_game_sdk.dll": "" } windows.release.x86_64 = { "windows/discord_partner_sdk.dll": "" }
linux.debug.x86_64 = { "linux/libdiscord_game_sdk.so": "" } linux.debug.x86_64 = { "linux/libdiscord_partner_sdk.so": "" }
linux.release.x86_64 = { "linux/libdiscord_game_sdk.so": "" } linux.release.x86_64 = { "linux/libdiscord_partner_sdk.so": "" }
linux.debug.arm64 = { "linux/libdiscord_game_sdk.so": "" } linux.debug.arm64 = { "linux/libdiscord_partner_sdk.so": "" }
linux.release.arm64 = { "linux/libdiscord_game_sdk.so": "" } linux.release.arm64 = { "linux/libdiscord_partner_sdk.so": "" }
linux.debug.rv64 = { "linux/libdiscord_game_sdk.so": "" } linux.debug.rv64 = { "linux/libdiscord_partner_sdk.so": "" }
linux.release.rv64 = { "linux/libdiscord_game_sdk.so": "" } linux.release.rv64 = { "linux/libdiscord_partner_sdk.so": "" }

2
src/discordgodot.cpp
View File

@@ -1,5 +1,5 @@
#include "lib/discord_social_sdk/include/discordpp.h"
#include "discordgodot.h" #include "discordgodot.h"
#include "discordpp.h"
#include <godot_cpp/core/class_db.hpp> #include <godot_cpp/core/class_db.hpp>
#include <godot_cpp/variant/utility_functions.hpp> #include <godot_cpp/variant/utility_functions.hpp>

2
src/discordgodot.h
View File

@@ -2,7 +2,7 @@
#define DISCORDGODOT_H #define DISCORDGODOT_H
#include <stdio.h> #include <stdio.h>
#include "discordpp.h" #include "lib/discord_social_sdk/include/discordpp.h"
#include <godot_cpp/classes/object.hpp> #include <godot_cpp/classes/object.hpp>
#include <godot_cpp/core/class_db.hpp> #include <godot_cpp/core/class_db.hpp>

2
src/editor_presence.cpp
View File

@@ -1,5 +1,5 @@
#include "editor_presence.h" #include "editor_presence.h"
#include "discordpp.h" #include "lib/discord_social_sdk/include/discordpp.h"
#include <godot_cpp/core/class_db.hpp> #include <godot_cpp/core/class_db.hpp>
#include <godot_cpp/variant/utility_functions.hpp> #include <godot_cpp/variant/utility_functions.hpp>
#include <godot_cpp/classes/scene_tree.hpp> #include <godot_cpp/classes/scene_tree.hpp>

2
src/editor_presence.h
View File

@@ -2,7 +2,7 @@
#define EDITOR_PRESENCE_H #define EDITOR_PRESENCE_H
#include <stdio.h> #include <stdio.h>
#include "discordpp.h" #include "lib/discord_social_sdk/include/discordpp.h"
#include <godot_cpp/classes/node.hpp> #include <godot_cpp/classes/node.hpp>
#include <godot_cpp/core/class_db.hpp> #include <godot_cpp/core/class_db.hpp>
#include <godot_cpp/classes/project_settings.hpp> #include <godot_cpp/classes/project_settings.hpp>

1
src/register_types.cpp
View File

@@ -6,6 +6,7 @@
#include <godot_cpp/classes/engine.hpp> #include <godot_cpp/classes/engine.hpp>
#include <godot_cpp/godot.hpp> #include <godot_cpp/godot.hpp>
#include "lib/discord_social_sdk/include/discordpp.h"
#include "discordgodot.h" #include "discordgodot.h"
#include "editor_presence.h" #include "editor_presence.h"
using namespace godot; using namespace godot;