diff --git a/SConstruct b/SConstruct index e3fac3a..24734e5 100644 --- a/SConstruct +++ b/SConstruct @@ -11,7 +11,7 @@ opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'pr opts.Add(PathVariable('target_name', 'The library name.', 'discord_game_sdk', PathVariable.PathAccept)) # Local dependency paths, adapt them to your setup -discord_lib_path = "project/addons/discord-rpc-gd/bin" +discord_lib_path = "lib/discord-game-sdk" # Updates the environment with the option variables. opts.Update(env) @@ -41,6 +41,7 @@ elif env['platform'] == "windows": # Set correct library discord_library = 'discord_game_sdk.dll' + # make sure our binding library is properly includes env.Append(LIBPATH=[discord_lib_path]) sources = Glob('src/discord-game-sdk-cpp/*.cpp') @@ -53,8 +54,16 @@ env.Append(LIBS=[ env.Append(CPPPATH=['src/']) sources += Glob('src/*.cpp') -library = env.SharedLibrary(target="project/addons/discord-rpc-gd/bin/libgd-discordrpc" + env["suffix"] + env["SHLIBSUFFIX"], source=sources) -#env.Depends(library, Command("project/addons/discord-rpc-gd/bin/" + discord_library, discord_lib_path + "/" + discord_library, Copy("$TARGET", "$SOURCE"))) +mytarget = "project/addons/discord-rpc-gd/bin/discordrpc" + env["suffix"] + env["SHLIBSUFFIX"] + +def finish( target, source, env ): + if env['platform'] == "windows": + os.remove((mytarget + ".exp").replace(".dll", "")) + os.remove((mytarget + ".lib").replace(".dll", "")) +library = env.SharedLibrary(target=mytarget, source=sources) +env.Depends(library, Command("project/addons/discord-rpc-gd/bin/" + discord_library, discord_lib_path + "/" + discord_library, Copy("$TARGET", "$SOURCE"))) + +Depends(library,Command(finish)) Default(library) diff --git a/cleanup.py b/cleanup.py new file mode 100644 index 0000000..bad00c6 --- /dev/null +++ b/cleanup.py @@ -0,0 +1,10 @@ +import os +import platform + +if platform.system() == "Windows": + for file in os.listdir("project/addons/discord-rpc-gd/bin/"): + if file.endswith(".exp"): + os.remove(os.path.join("project/addons/discord-rpc-gd/bin/", file)) + for file in os.listdir("project/addons/discord-rpc-gd/bin/"): + if file.endswith(".lib"): + os.remove(os.path.join("project/addons/discord-rpc-gd/bin/", file)) \ No newline at end of file diff --git a/project/addons/discord-rpc-gd/bin/discord_game_sdk.bundle b/lib/discord-game-sdk/discord_game_sdk.bundle similarity index 100% rename from project/addons/discord-rpc-gd/bin/discord_game_sdk.bundle rename to lib/discord-game-sdk/discord_game_sdk.bundle diff --git a/lib/discord-game-sdk/discord_game_sdk.dll b/lib/discord-game-sdk/discord_game_sdk.dll new file mode 100644 index 0000000..be946ea Binary files /dev/null and b/lib/discord-game-sdk/discord_game_sdk.dll differ diff --git a/project/addons/discord-rpc-gd/bin/discord_game_sdk.dylib b/lib/discord-game-sdk/discord_game_sdk.dylib similarity index 100% rename from project/addons/discord-rpc-gd/bin/discord_game_sdk.dylib rename to lib/discord-game-sdk/discord_game_sdk.dylib diff --git a/project/addons/discord-rpc-gd/bin/discord_game_sdk.lib b/lib/discord-game-sdk/discord_game_sdk.lib similarity index 100% rename from project/addons/discord-rpc-gd/bin/discord_game_sdk.lib rename to lib/discord-game-sdk/discord_game_sdk.lib diff --git a/project/addons/discord-rpc-gd/bin/discord_game_sdk.so b/lib/discord-game-sdk/discord_game_sdk.so similarity index 100% rename from project/addons/discord-rpc-gd/bin/discord_game_sdk.so rename to lib/discord-game-sdk/discord_game_sdk.so diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll b/project/addons/discord-rpc-gd/bin/discordrpc.windows.template_debug.x86_64.dll similarity index 93% rename from project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll rename to project/addons/discord-rpc-gd/bin/discordrpc.windows.template_debug.x86_64.dll index ca82f96..83b4709 100644 Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.dll and b/project/addons/discord-rpc-gd/bin/discordrpc.windows.template_debug.x86_64.dll differ diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp deleted file mode 100644 index ff55646..0000000 Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.exp and /dev/null differ diff --git a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib b/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib deleted file mode 100644 index ee7f576..0000000 Binary files a/project/addons/discord-rpc-gd/bin/libgd-discordrpc.windows.template_debug.x86_64.lib and /dev/null differ diff --git a/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension index 0ed1a6e..5647035 100644 --- a/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension +++ b/project/addons/discord-rpc-gd/discord-rpc-gd.gdextension @@ -4,22 +4,22 @@ entry_symbol = "discordrpcgd_library_init" [libraries] -macos.debug = "bin/libgd-discordrpc.macos.template_debug.framework" -macos.release = "bin/libgd-discordrpc.macos.template_release.framework" -windows.debug.x86_32 = "bin/libgd-discordrpc.windows.template_debug.x86_32.dll" +macos.debug = "bin/discordrpc.macos.template_debug.framework" +macos.release = "bin/discordrpc.macos.template_release.framework" +windows.debug.x86_32 = "bin/discordrpc.windows.template_debug.x86_32.dll" windows.release.x86_32 = "bin/libgdexample.windows.template_release.x86_32.dll" -windows.debug.x86_64 = "bin/libgd-discordrpc.windows.template_debug.x86_64.dll" -windows.release.x86_64 = "bin/libgd-discordrpc.windows.template_release.x86_64.dll" -linux.debug.x86_64 = "bin/libgd-discordrpc.linux.template_debug.x86_64.so" -linux.release.x86_64 = "bin/libgd-discordrpc.linux.template_release.x86_64.so" -linux.debug.arm64 = "bin/libgd-discordrpc.linux.template_debug.arm64.so" -linux.release.arm64 = "bin/libgd-discordrpc.linux.template_release.arm64.so" -linux.debug.rv64 = "bin/libgd-discordrpc.linux.template_debug.rv64.so" -linux.release.rv64 = "bin/libgd-discordrpc.linux.template_release.rv64.so" -android.debug.x86_64 = "bin/libgd-discordrpc.android.template_debug.x86_64.so" -android.release.x86_64 = "bin/libgd-discordrpc.android.template_release.x86_64.so" -android.debug.arm64 = "bin/libgd-discordrpc.android.template_debug.arm64.so" -android.release.arm64 = "bin/libgd-discordrpc.android.template_release.arm64.so" +windows.debug.x86_64 = "bin/discordrpc.windows.template_debug.x86_64.dll" +windows.release.x86_64 = "bin/discordrpc.windows.template_release.x86_64.dll" +linux.debug.x86_64 = "bin/discordrpc.linux.template_debug.x86_64.so" +linux.release.x86_64 = "bin/discordrpc.linux.template_release.x86_64.so" +linux.debug.arm64 = "bin/discordrpc.linux.template_debug.arm64.so" +linux.release.arm64 = "bin/discordrpc.linux.template_release.arm64.so" +linux.debug.rv64 = "bin/discordrpc.linux.template_debug.rv64.so" +linux.release.rv64 = "bin/discordrpc.linux.template_release.rv64.so" +android.debug.x86_64 = "bin/discordrpc.android.template_debug.x86_64.so" +android.release.x86_64 = "bin/discordrpc.android.template_release.x86_64.so" +android.debug.arm64 = "bin/discordrpc.android.template_debug.arm64.so" +android.release.arm64 = "bin/discordrpc.android.template_release.arm64.so" [dependencies] diff --git a/src/main.windows.template_debug.x86_64.obj b/src/main.windows.template_debug.x86_64.obj index 4d9bb30..03c6378 100644 Binary files a/src/main.windows.template_debug.x86_64.obj and b/src/main.windows.template_debug.x86_64.obj differ diff --git a/src/register_types.windows.template_debug.x86_64.obj b/src/register_types.windows.template_debug.x86_64.obj index e798a04..3d54d05 100644 Binary files a/src/register_types.windows.template_debug.x86_64.obj and b/src/register_types.windows.template_debug.x86_64.obj differ