setup rpc but crashes
This commit is contained in:
48
SConstruct
48
SConstruct
@@ -5,19 +5,19 @@ import os
|
|||||||
env = SConscript("src/lib/godot-cpp/SConstruct")
|
env = SConscript("src/lib/godot-cpp/SConstruct")
|
||||||
|
|
||||||
# Check our platform specifics
|
# Check our platform specifics
|
||||||
if env["platform"] == "macos":
|
# if env["platform"] == "macos":
|
||||||
discord_library = "libdiscord_game_sdk.dylib"
|
# discord_library = "libdiscord_game_sdk.dylib"
|
||||||
discord_library_second = "libdiscord_game_sdk_aarch64.dylib"
|
# discord_library_second = "libdiscord_game_sdk_aarch64.dylib"
|
||||||
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_game_sdk.so"
|
||||||
discord_library_second = ""
|
# discord_library_second = ""
|
||||||
libexportfolder = "/linux/"
|
# libexportfolder = "/linux/"
|
||||||
|
|
||||||
elif env["platform"] == "windows":
|
if env["platform"] == "windows":
|
||||||
discord_library = "discord_game_sdk.dll"
|
discord_library = "discord-rpc.dll"
|
||||||
discord_library_second = "discord_game_sdk_x86.dll"
|
# discord_library_second = "discord_game_sdk_x86.dll"
|
||||||
libexportfolder = "/windows/"
|
libexportfolder = "/windows/"
|
||||||
|
|
||||||
if env["target"] == "template_debug":
|
if env["target"] == "template_debug":
|
||||||
@@ -26,14 +26,12 @@ else:
|
|||||||
debugsuffix = ""
|
debugsuffix = ""
|
||||||
|
|
||||||
# make sure our binding library is properly includes
|
# make sure our binding library is properly includes
|
||||||
env.Append(LIBPATH=["src/lib/discord_game_sdk/bin/"])
|
env.Append(LIBPATH=["src/lib/discord-rpc/builds/install/win64-dynamic/lib/"])
|
||||||
sources = Glob("src/lib/discord_game_sdk/cpp/*.cpp")
|
env.Append(LIBS=["discord-rpc"])
|
||||||
env.Append(CPPPATH=["src/lib/discord_game_sdk/cpp/"])
|
|
||||||
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/"])
|
||||||
sources += Glob("src/*.cpp")
|
sources = Glob("src/*.cpp")
|
||||||
|
|
||||||
# The finished exports
|
# The finished exports
|
||||||
library = env.SharedLibrary(
|
library = env.SharedLibrary(
|
||||||
@@ -47,17 +45,17 @@ env.Depends(
|
|||||||
library,
|
library,
|
||||||
Command(
|
Command(
|
||||||
"project/addons/discord-sdk-gd/bin/" + libexportfolder + discord_library,
|
"project/addons/discord-sdk-gd/bin/" + libexportfolder + discord_library,
|
||||||
"src/lib/discord_game_sdk/bin/" + discord_library,
|
"src/lib/discord-rpc/builds/install/win64-dynamic/bin/" + discord_library,
|
||||||
Copy("$TARGET", "$SOURCE"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
env.Depends(
|
|
||||||
library,
|
|
||||||
Command(
|
|
||||||
"project/addons/discord-sdk-gd/bin/" + libexportfolder + discord_library_second,
|
|
||||||
"src/lib/discord_game_sdk/bin/" + discord_library_second,
|
|
||||||
Copy("$TARGET", "$SOURCE"),
|
Copy("$TARGET", "$SOURCE"),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
# env.Depends(
|
||||||
|
# library,
|
||||||
|
# Command(
|
||||||
|
# "project/addons/discord-sdk-gd/bin/" + libexportfolder + discord_library_second,
|
||||||
|
# "src/lib/discord_game_sdk/bin/" + discord_library_second,
|
||||||
|
# Copy("$TARGET", "$SOURCE"),
|
||||||
|
# ),
|
||||||
|
# )
|
||||||
|
|
||||||
Default(library)
|
Default(library)
|
||||||
|
BIN
project/addons/discord-sdk-gd/bin/windows/discord-rpc.dll
Normal file
BIN
project/addons/discord-sdk-gd/bin/windows/discord-rpc.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -19,8 +19,8 @@ linux.release.rv64 = "bin/linux/libdiscord_game_sdk_binding.so"
|
|||||||
|
|
||||||
macos.debug = "bin/macos/libdiscord_game_sdk.dylib"
|
macos.debug = "bin/macos/libdiscord_game_sdk.dylib"
|
||||||
macos.release = "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.debug.x86_64 = "bin/windows/discord-rpc.dll"
|
||||||
windows.release.x86_64 = "bin/windows/discord_game_sdk.dll"
|
windows.release.x86_64 = "bin/windows/discord-rpc.dll"
|
||||||
linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk.so"
|
linux.debug.x86_64 = "bin/linux/libdiscord_game_sdk.so"
|
||||||
linux.release.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.debug.arm64 = "bin/linux/libdiscord_game_sdk.so"
|
||||||
|
38
setup.py
38
setup.py
@@ -3,42 +3,6 @@ from distutils.dir_util import copy_tree
|
|||||||
import shutil
|
import shutil
|
||||||
import os
|
import os
|
||||||
|
|
||||||
with zipfile.ZipFile("src/lib/discord_game_sdk.zip", "r") as zip_ref:
|
os.system("python ./src/lib/discord-rpc/build.py")
|
||||||
zip_ref.extractall("src/lib/discord_game_sdk/")
|
|
||||||
|
|
||||||
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",
|
|
||||||
)
|
|
||||||
os.rename(
|
|
||||||
"src/lib/discord_game_sdk/bin/x86_64/discord_game_sdk.so",
|
|
||||||
"src/lib/discord_game_sdk/bin/x86_64/libdiscord_game_sdk.so",
|
|
||||||
)
|
|
||||||
os.rename(
|
|
||||||
"src/lib/discord_game_sdk/bin/x86/discord_game_sdk.dll",
|
|
||||||
"src/lib/discord_game_sdk/bin/x86/discord_game_sdk_x86.dll",
|
|
||||||
)
|
|
||||||
|
|
||||||
os.rename(
|
|
||||||
"src/lib/discord_game_sdk/bin/x86_64/discord_game_sdk.dll.lib",
|
|
||||||
"src/lib/discord_game_sdk/bin/x86_64/discord_game_sdk.lib",
|
|
||||||
)
|
|
||||||
copy_tree("src/lib/discord_game_sdk/bin/aarch64/", "src/lib/discord_game_sdk/bin/")
|
|
||||||
copy_tree("src/lib/discord_game_sdk/bin/x86/", "src/lib/discord_game_sdk/bin/")
|
|
||||||
copy_tree("src/lib/discord_game_sdk/bin/x86_64/", "src/lib/discord_game_sdk/bin/")
|
|
||||||
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/c/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/csharp/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/examples/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/lib/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/bin/aarch64/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/bin/x86/", ignore_errors=True)
|
|
||||||
shutil.rmtree("src/lib/discord_game_sdk/bin/x86_64/", ignore_errors=True)
|
|
||||||
os.remove("src/lib/discord_game_sdk/README.md")
|
|
||||||
|
|
||||||
os.system("git submodule update --init")
|
os.system("git submodule update --init")
|
||||||
|
Reference in New Issue
Block a user