Start adding files for Mac/Linux

This commit is contained in:
twinaphex 2018-05-29 10:30:56 +02:00
parent d488dfcafa
commit 4a035f5b22
4 changed files with 37 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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