diff --git a/deps/discord-rpc/src/connection_unix.cpp b/deps/discord-rpc/src/connection_unix.cpp index ceae895e1a..67fa5083d8 100644 --- a/deps/discord-rpc/src/connection_unix.cpp +++ b/deps/discord-rpc/src/connection_unix.cpp @@ -9,6 +9,10 @@ #include #include +#if defined(OSX) +extern "C" void CFTemporaryDirectory(char *s, size_t len); +#endif + struct BaseConnectionUnix : public BaseConnection { int sock{-1}; }; @@ -23,12 +27,18 @@ static int MsgFlags = 0; static const char* GetTempPath(void) { +#if defined(OSX) + static char temp[1024]; + CFTemporaryDirectory(temp, 1024); + return temp; +#else const char* temp = getenv("XDG_RUNTIME_DIR"); temp = temp ? temp : getenv("TMPDIR"); temp = temp ? temp : getenv("TMP"); temp = temp ? temp : getenv("TEMP"); temp = temp ? temp : "/tmp"; return temp; +#endif } /*static*/ BaseConnection* BaseConnection::Create() diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 7c46115106..1fa5d14ea7 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -139,7 +139,7 @@ static void CFSearchPathForDirectoriesInDomains( CFStringGetCString(array_val, s, len, kCFStringEncodingUTF8); } -static void CFTemporaryDirectory(char *s, size_t len) +void CFTemporaryDirectory(char *s, size_t len) { #if __has_feature(objc_arc) CFStringRef path = (__bridge CFStringRef)NSTemporaryDirectory(); diff --git a/griffin/griffin.c b/griffin/griffin.c index 72faf6a311..6aaf10ae33 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1692,5 +1692,8 @@ STEAM INTEGRATION USING MIST #ifdef HAVE_MIST #include "../steam/steam.c" #include "../tasks/task_steam.c" +#endif + +#ifdef HAVE_PRESENCE #include "../network/presence.c" #endif diff --git a/pkg/apple/BaseConfig.xcconfig b/pkg/apple/BaseConfig.xcconfig index 878df93e13..18cd3d9027 100644 --- a/pkg/apple/BaseConfig.xcconfig +++ b/pkg/apple/BaseConfig.xcconfig @@ -57,6 +57,7 @@ OTHER_CFLAGS = $(inherited) -DHAVE_OPENGL_CORE OTHER_CFLAGS = $(inherited) -DHAVE_OVERLAY OTHER_CFLAGS = $(inherited) -DHAVE_OZONE OTHER_CFLAGS = $(inherited) -DHAVE_PATCH +OTHER_CFLAGS = $(inherited) -DHAVE_PRESENCE OTHER_CFLAGS = $(inherited) -DHAVE_RBMP OTHER_CFLAGS = $(inherited) -DHAVE_REWIND OTHER_CFLAGS = $(inherited) -DHAVE_RGUI