ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8092 from orbea/thread 

Makefile.common: Fix building discord-rpc with --disable-threads.
This commit is contained in:
Twinaphex 2019-01-25 00:26:32 +01:00 committed by GitHub
parent c99c16363c aa2fd6cfed
commit c8c23ffcfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.common
View File

@ -1743,6 +1743,11 @@ ifeq ($(HAVE_NETWORKING), 1)
NEED_CXX_LINKER = 1 NEED_CXX_LINKER = 1
DEFINES += -DHAVE_DISCORD DEFINES += -DHAVE_DISCORD
DEFINES += -Ideps/discord-rpc/include/ -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/ DEFINES += -Ideps/discord-rpc/include/ -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
ifneq ($(HAVE_THREADS), 1)
DEFINES += -DDISCORD_DISABLE_IO_THREAD
endif
OBJ += deps/discord-rpc/src/discord_rpc.o \ OBJ += deps/discord-rpc/src/discord_rpc.o \
deps/discord-rpc/src/rpc_connection.o \ deps/discord-rpc/src/rpc_connection.o \
deps/discord-rpc/src/serialization.o \ deps/discord-rpc/src/serialization.o \