From 3e9302f3541c5cab23e3cff23e3f01537205d1cc Mon Sep 17 00:00:00 2001 From: Yannik <80621863+vaporvee@users.noreply.github.com> Date: Fri, 12 May 2023 12:52:38 +0200 Subject: [PATCH] removed NULL return for linux building --- SConstruct | 2 +- .../bin/windows/discord_game_sdk_binding.dll | Bin 169984 -> 169984 bytes .../discord_game_sdk_binding_debug.dll | Bin 171520 -> 171520 bytes src/discordgodot.cpp | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index c9226ef..fb2f1c9 100644 --- a/SConstruct +++ b/SConstruct @@ -28,7 +28,7 @@ else: # make sure our binding library is properly includes 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(CPPPATH=["src/lib/discord_game_sdk/cpp/"]) # this line for some reason doesn't get understanded by most linux distros env.Append(LIBS=["discord_game_sdk"]) # tweak this if you want to use different folders, or more folders, to store your source code in. diff --git a/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll b/project/addons/discord-sdk-gd/bin/windows/discord_game_sdk_binding.dll index c5950fbf2441f2809f48e231d8ffb674f3203f7f..fc08e8f22c0e0bf5159699cc022e745c01ff0507 100644 GIT binary patch delta 34 ocmZqJz}2vUYl8qI(^J7_A;xwgM#k+zj7&+gK>qeJIi{{k0JKjD@&Et; delta 34 ocmZqJz}2vUYl8qIQy^cn5M#R#Bja`l_$6{cI20H~J<8~^|S delta 34 ocmZqJ!_}~dYl8qIlNVpJ5M#R#Bja`3e&Ah0H1vbiU0rr diff --git a/src/discordgodot.cpp b/src/discordgodot.cpp index c5dc0ff..c31c7ab 100644 --- a/src/discordgodot.cpp +++ b/src/discordgodot.cpp @@ -112,7 +112,7 @@ void Discord_Activity::set_app_id(int64_t value) int64_t Discord_Activity::get_app_id() { if (app_id = 461618159171141643) - return NULL; + return 0; else return app_id; }