diff --git a/Makefile.common b/Makefile.common
index 91116af3cb..2cb48b05d9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1635,6 +1635,14 @@ ifneq ($(findstring Win32,$(OS)),)
 				  deps/discord-rpc/src/connection_win.o
       LIBS += -lpsapi -ladvapi32
 endif
+ifneq ($(findstring Linux,$(OS)),)
+		OBJ  += deps/discord-rpc/src/discord_register_linux.o \
+				  deps/discord-rpc/src/connection_unix.o
+endif
+ifneq ($(findstring Darwin,$(OS)),)
+		OBJ  += deps/discord-rpc/src/discord_register_osx.o \
+				  deps/discord-rpc/src/connection_unix.o
+endif
 
    endif
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 8183d5ec74..760184d899 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1394,3 +1394,7 @@ HTTP SERVER
 #include "../deps/civetweb/civetweb.c"
 #include "network/httpserver/httpserver.c"
 #endif
+
+#if defined(HAVE_DISCORD)
+#include "../discord/discord.c"
+#endif
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 91b377214e..c0617f267f 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -80,3 +80,20 @@ FONTS
 #include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp"
 #endif
 #endif
+
+#if defined(HAVE_DISCORD)
+#include "../deps/discord-rpc/src/discord_rpc.cpp"
+#include "../deps/discord-rpc/src/rpc_connection.cpp"
+#include "../deps/discord-rpc/src/serialization.cpp"
+
+#if defined(_WIN32)
+#include "../deps/discord-rpc/src/discord_register_win.cpp"
+#include "../deps/discord-rpc/src/connection_win.cpp"
+#endif
+#if defined(__linux__)
+#include "../deps/discord-rpc/src/discord_register_linux.cpp"
+#endif
+#if defined(__unix__) || defined(__APPLE__)
+#include "../deps/discord-rpc/src/connection_unix.cpp"
+#endif
+#endif
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index 80526dceca..f08e7bb375 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -52,3 +52,11 @@
 #ifdef HAVE_MFI
 #include "../input/drivers_joypad/mfi_joypad.m"
 #endif
+
+#if defined(HAVE_DISCORD)
+
+#if defined(__APPLE__)
+#include "../deps/discord-rpc/src/discord_register_osx.m"
+#endif
+
+#endif