[pull] master from libretro:master

Makefile.common

@@ -1281,6 +1281,7 @@ endif
 
 ifeq ($(HAVE_WAYLAND), 1)
  OBJ += gfx/drivers_context/wayland_ctx.o \
+        gfx/display_servers/dispserv_wl.o \
         input/common/wayland_common.o \
         input/drivers/wayland_input.o \
         gfx/common/wayland_common.o \
@@ -2460,34 +2461,10 @@ ifeq ($(HAVE_NETWORKING), 1)
    endif
 
    ifeq ($(HAVE_DISCORD), 1)
-      NEED_CXX_LINKER = 1
       HAVE_PRESENCE = 1
       DEFINES += -DHAVE_DISCORD
-      INCLUDE_DIRS += -Ideps/discord-rpc/include
-
-      ifneq ($(HAVE_THREADS), 1)
-         DEFINES += -DDISCORD_DISABLE_IO_THREAD
-      endif
-
-      OBJ     += deps/discord-rpc/src/discord_rpc.o \
-                 deps/discord-rpc/src/rpc_connection.o \
-                 deps/discord-rpc/src/serialization.o
 
       OBJ     += network/discord.o
-
-      ifneq ($(findstring Win32,$(OS)),)
-         OBJ  += deps/discord-rpc/src/discord_register_win.o \
-                 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
 
    ifeq ($(HAVE_TRANSLATE), 1)