From a675f4efd5cf9141d9bbab556abb3924b27fd9df Mon Sep 17 00:00:00 2001 From: MysterD Date: Mon, 14 Sep 2020 23:26:55 -0700 Subject: [PATCH] Fixed Linux builds --- Makefile | 6 ++++-- .../{discord_game_sdk.so => libdiscord_game_sdk.so} | Bin src/pc/network/discord/discord.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) rename lib/discordsdk/{discord_game_sdk.so => libdiscord_game_sdk.so} (100%) diff --git a/Makefile b/Makefile index b9dd8816c..1417dcf76 100644 --- a/Makefile +++ b/Makefile @@ -431,7 +431,7 @@ else ifeq ($(OSX_BUILD),1) # needs testing DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.dylib else - DISCORD_SDK_LIBS := lib/discordsdk/discord_game_sdk.so + DISCORD_SDK_LIBS := lib/discordsdk/libdiscord_game_sdk.so endif # Automatic dependency files @@ -692,9 +692,11 @@ endif ifeq ($(WINDOWS_BUILD),1) LDFLAGS += -L"ws2_32" -lwsock32 + LDFLAGS += -Wl,-Bdynamic -ldiscord_game_sdk -Wl,-Bstatic +else + LDFLAGS += -ldiscord_game_sdk -Wl,-rpath . -Wl,-rpath lib/discordsdk endif -LDFLAGS += -Wl,-Bdynamic -ldiscord_game_sdk -Wl,-Bstatic # End of LDFLAGS diff --git a/lib/discordsdk/discord_game_sdk.so b/lib/discordsdk/libdiscord_game_sdk.so similarity index 100% rename from lib/discordsdk/discord_game_sdk.so rename to lib/discordsdk/libdiscord_game_sdk.so diff --git a/src/pc/network/discord/discord.c b/src/pc/network/discord/discord.c index e23b7fb40..a8a9df445 100644 --- a/src/pc/network/discord/discord.c +++ b/src/pc/network/discord/discord.c @@ -9,6 +9,7 @@ #include #else #include +#define MAX_PATH 1024 #endif #define MAX_LAUNCH_CMD (MAX_PATH + 12)