libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-13 05:10:42 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(Mac) Add Discord RPC support - untested

Browse Source
This commit is contained in:
twinaphex 2021-08-25 09:55:39 +02:00
parent 10e1f5d72a
commit df98bca9ae
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/discord-rpc/src/connection_unix.cpp vendored
View File

@ -13,7 +13,7 @@ struct BaseConnectionUnix : public BaseConnection {
int sock{-1};
};
static BaseConnectionUnix Connection;
static BaseConnectionUnix ConnectionUnix;
static sockaddr_un PipeAddr{};
#ifdef MSG_NOSIGNAL
static int MsgFlags = MSG_NOSIGNAL;
@ -34,7 +34,7 @@ static const char* GetTempPath(void)
/*static*/ BaseConnection* BaseConnection::Create()
{
PipeAddr.sun_family = AF_UNIX;
return &Connection;
return &ConnectionUnix;
}
/*static*/ void BaseConnection::Destroy(BaseConnection*& c)

2
pkg/apple/BaseConfig.xcconfig
View File

@ -4,7 +4,7 @@
//
// Created by Stuart Carnie on 5/10/18.
//
OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_ONLINE_UPDATER -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_REWIND -DHAVE_SCREENSHOTS -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_RWAV -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE -DHAVE_VIDEO_LAYOUT -DHAVE_COMMAND -DHAVE_NETWORK_CMD -DHAVE_ACCESSIBILITY -DHAVE_TRANSLATE
OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_ONLINE_UPDATER -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER -DHAVE_REWIND -DHAVE_SCREENSHOTS -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -D_7ZIP_ST -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_BUILTINGLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_RWAV -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE -DHAVE_VIDEO_LAYOUT -DHAVE_COMMAND -DHAVE_NETWORK_CMD -DHAVE_ACCESSIBILITY -DHAVE_TRANSLATE -DHAVE_DISCORD
SRCBASE = $(SRCROOT)/../..
DEPS_DIR = $(SRCBASE)/deps

6
pkg/apple/RetroArch.xcodeproj/project.pbxproj
View File

@ -392,6 +392,7 @@
"$(SRCROOT)/../../gfx/include",
"$(SRCROOT)/../../libretro-common/include",
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
"$(SRCROOT)/../../deps/discord-rpc/include",
"$(SRCROOT)/../../deps/libFLAC/include",
"$(SRCROOT)/../../deps/rcheevos/include",
"$(SRCROOT)/../../deps/7zip",
@ -434,6 +435,7 @@
"$(SRCROOT)/../../gfx/include",
"$(SRCROOT)/../../libretro-common/include",
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
"$(SRCROOT)/../../deps/discord-rpc/include",
"$(SRCROOT)/../../deps/libFLAC/include",
"$(SRCROOT)/../../deps/rcheevos/include",
"$(SRCROOT)/../../deps/7zip",
@ -479,6 +481,7 @@
"$(SRCROOT)/../../gfx/include",
"$(SRCROOT)/../../libretro-common/include",
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
"$(SRCROOT)/../../deps/discord-rpc/include",
"$(SRCROOT)/../../deps/libFLAC/include",
"$(SRCROOT)/../../deps/rcheevos/include",
"$(SRCROOT)/../../deps/7zip",
@ -518,6 +521,7 @@
"$(SRCROOT)/../../gfx/include",
"$(SRCROOT)/../../libretro-common/include",
"$(SRCROOT)/../../libretro-common/include/compat/zlib",
"$(SRCROOT)/../../deps/discord-rpc/include",
"$(SRCROOT)/../../deps/libFLAC/include",
"$(SRCROOT)/../../deps/rcheevos/include",
"$(SRCROOT)/../../deps/7zip",
@ -574,6 +578,7 @@
"-DHAVE_RGUI",
"-DHAVE_CONFIGFILE",
"-DHAVE_PATCH",
"-DHAVE_DISCORD",
"-DHAVE_DSP_FILTER",
"-DHAVE_VIDEO_FILTER",
"-DHAVE_REWIND",
@ -661,6 +666,7 @@
"-DHAVE_RGUI",
"-DHAVE_CONFIGFILE",
"-DHAVE_PATCH",
"-DHAVE_DISCORD",
"-DHAVE_DSP_FILTER",
"-DHAVE_VIDEO_FILTER",
"-DHAVE_REWIND",

2
pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
View File

@ -1814,6 +1814,7 @@
"$(SRCBASE)/gfx/include",
"$(SRCBASE)/libretro-common/include",
"$(SRCBASE)/libretro-common/include/compat/zlib",
"$(DEPS_DIR)/discord-rpc/include",
"$(DEPS_DIR)/libFLAC/include",
"$(DEPS_DIR)/7zip",
"$(DEPS_DIR)/rcheevos/include",
@ -1870,6 +1871,7 @@
"$(SRCBASE)/gfx/include",
"$(SRCBASE)/libretro-common/include",
"$(SRCBASE)/libretro-common/include/compat/zlib",
"$(DEPS_DIR)/discord-rpc/include",
"$(DEPS_DIR)/libFLAC/include",
"$(DEPS_DIR)/7zip",
"$(DEPS_DIR)/rcheevos/include",

4
retroarch.c
View File

@ -6645,8 +6645,8 @@ static void handle_discord_join_request(const DiscordUser* request)
#ifdef HAVE_MENU
#if 0
char buf[PATH_MAX_LENGTH];
#endif
menu_input_ctx_line_t line;
#endif
struct rarch_state *p_rarch = &rarch_st;
RARCH_LOG("[DISCORD]: Join request from %s#%s - %s %s\n",
@ -6879,7 +6879,9 @@ static void discord_init(
const char *discord_app_id, char *args)
{
DiscordEventHandlers handlers;
#ifdef _WIN32
char full_path[PATH_MAX_LENGTH];
#endif
char command[PATH_MAX_LENGTH];
discord_st->start_time = time(0);