Revert "setup rpc but crashes" wrong branch

This reverts commit 4686612abf.
This commit is contained in:
Yannik
2023-05-07 20:45:10 +02:00
parent 4686612abf
commit baaf44c494
6 changed files with 64 additions and 26 deletions

View File

@@ -5,19 +5,19 @@ import os
env = SConscript("src/lib/godot-cpp/SConstruct")
# Check our platform specifics
# if env["platform"] == "macos":
# discord_library = "libdiscord_game_sdk.dylib"
# discord_library_second = "libdiscord_game_sdk_aarch64.dylib"
# libexportfolder = "/macos/"
if env["platform"] == "macos":
discord_library = "libdiscord_game_sdk.dylib"
discord_library_second = "libdiscord_game_sdk_aarch64.dylib"
libexportfolder = "/macos/"
# elif env["platform"] in ("linuxbsd", "linux"):
# discord_library = "libdiscord_game_sdk.so"
# discord_library_second = ""
# libexportfolder = "/linux/"
elif env["platform"] in ("linuxbsd", "linux"):
discord_library = "libdiscord_game_sdk.so"
discord_library_second = ""
libexportfolder = "/linux/"
if env["platform"] == "windows":
discord_library = "discord-rpc.dll"
# discord_library_second = "discord_game_sdk_x86.dll"
elif env["platform"] == "windows":
discord_library = "discord_game_sdk.dll"
discord_library_second = "discord_game_sdk_x86.dll"
libexportfolder = "/windows/"
if env["target"] == "template_debug":
@@ -26,12 +26,14 @@ else:
debugsuffix = ""
# make sure our binding library is properly includes
env.Append(LIBPATH=["src/lib/discord-rpc/builds/install/win64-dynamic/lib/"])
env.Append(LIBS=["discord-rpc"])
env.Append(LIBPATH=["src/lib/discord_game_sdk/bin/"])
sources = Glob("src/lib/discord_game_sdk/cpp/*.cpp")
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.
env.Append(CPPPATH=["src/"])
sources = Glob("src/*.cpp")
sources += Glob("src/*.cpp")
# The finished exports
library = env.SharedLibrary(
@@ -45,17 +47,17 @@ env.Depends(
library,
Command(
"project/addons/discord-sdk-gd/bin/" + libexportfolder + discord_library,
"src/lib/discord-rpc/builds/install/win64-dynamic/bin/" + discord_library,
"src/lib/discord_game_sdk/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"),
),
)
# 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)