diff --git a/deps/discord-rpc/src/connection_unix.cpp b/deps/discord-rpc/src/connection_unix.cpp index 9de76285d6..ceae895e1a 100644 --- a/deps/discord-rpc/src/connection_unix.cpp +++ b/deps/discord-rpc/src/connection_unix.cpp @@ -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) diff --git a/pkg/apple/BaseConfig.xcconfig b/pkg/apple/BaseConfig.xcconfig index ab89f7b07f..981829809d 100644 --- a/pkg/apple/BaseConfig.xcconfig +++ b/pkg/apple/BaseConfig.xcconfig @@ -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 diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj index 49b012b4d1..c9932a5df5 100644 --- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -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", diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj index cd79a4dbfd..756ff68b4b 100644 --- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj +++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj @@ -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", diff --git a/retroarch.c b/retroarch.c index a16e000c81..e36b8898cf 100644 --- a/retroarch.c +++ b/retroarch.c @@ -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);