From 54f4b0b890811989c80fd9da10e66e7443712fca Mon Sep 17 00:00:00 2001 From: MyPasswordIsWeak Date: Sat, 17 Oct 2020 21:11:38 +0200 Subject: [PATCH 1/3] Fixed rpc not working on linux --- libs/{discord-rpc => discord-rpc.dylib} | Bin libs/discordRPC.lua | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) rename libs/{discord-rpc => discord-rpc.dylib} (100%) diff --git a/libs/discord-rpc b/libs/discord-rpc.dylib similarity index 100% rename from libs/discord-rpc rename to libs/discord-rpc.dylib diff --git a/libs/discordRPC.lua b/libs/discordRPC.lua index c45c5da..3e4a736 100644 --- a/libs/discordRPC.lua +++ b/libs/discordRPC.lua @@ -1,5 +1,23 @@ local ffi = require "ffi" -local discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc") + + +-- Get the host os to load correct lib +local os = love.system.getOS() +local discordRPClib = nil + + +if os == 'Linux' then + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.so") +elseif os == 'OS X' then + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dylib") +elseif os == 'Windows' then + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dll") +else + -- Else it crashes later on + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.e") + print('Discord rpc not supported on platform') +end + ffi.cdef[[ typedef struct DiscordRichPresence { From 5b960d7291c2893948448b0bb591d2acc9ed1723 Mon Sep 17 00:00:00 2001 From: MyPasswordIsWeak Date: Sat, 17 Oct 2020 21:15:06 +0200 Subject: [PATCH 2/3] Change single quotes to double quotes --- libs/discordRPC.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/discordRPC.lua b/libs/discordRPC.lua index 3e4a736..0e6a696 100644 --- a/libs/discordRPC.lua +++ b/libs/discordRPC.lua @@ -6,16 +6,16 @@ local os = love.system.getOS() local discordRPClib = nil -if os == 'Linux' then +if os == "Linux" then discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.so") -elseif os == 'OS X' then +elseif os == "OS X" then discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dylib") -elseif os == 'Windows' then +elseif os == "Windows" then discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dll") else -- Else it crashes later on discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.e") - print('Discord rpc not supported on platform') + print("Discord rpc not supported on platform") end From b6423c3335a72dc2dee03bd8b1e923e0cf7693ca Mon Sep 17 00:00:00 2001 From: MyPasswordIsWeak Date: Sat, 17 Oct 2020 21:17:49 +0200 Subject: [PATCH 3/3] Change tabs to spaces for consistency --- libs/discordRPC.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/discordRPC.lua b/libs/discordRPC.lua index 0e6a696..7e4e8d3 100644 --- a/libs/discordRPC.lua +++ b/libs/discordRPC.lua @@ -7,15 +7,15 @@ local discordRPClib = nil if os == "Linux" then - discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.so") + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.so") elseif os == "OS X" then - discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dylib") + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dylib") elseif os == "Windows" then - discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dll") + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.dll") else - -- Else it crashes later on - discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.e") - print("Discord rpc not supported on platform") + -- Else it crashes later on + discordRPClib = ffi.load(love.filesystem.getSource().."/libs/discord-rpc.e") + print("Discord rpc not supported on platform") end