mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-05-28 14:23:18 +00:00
added discord rpc (#1178)
* added discord rpc
* linting issues
* Revert "linting issues"
This reverts commit 55f4e39506
.
* fix clang-format issues
* removed wrong rpc submodule
* added correct rpc submodule
* Moved cmake instructions to correct files.
* added minor suggestions from pr
* Added an option to enable/disable RPC, added rpc to emulator.cpp making it work on nonqt builds
* typo & minor stuff
* Changed getInstance implementation with Singleton class.
* Update discord_rpc_handler.cpp
discord id
* fixed ci clangformat errors
---------
Co-authored-by: georgemoralis <giorgosmrls@gmail.com>
This commit is contained in:
parent
aba803bd04
commit
3e7137cc6b
14 changed files with 133 additions and 50 deletions
5
externals/CMakeLists.txt
vendored
5
externals/CMakeLists.txt
vendored
|
@ -184,5 +184,10 @@ if (NOT TARGET pugixml::pugixml)
|
|||
add_subdirectory(pugixml)
|
||||
endif()
|
||||
|
||||
# Discord RPC
|
||||
set(BUILD_EXAMPLES OFF)
|
||||
add_subdirectory(discord-rpc/)
|
||||
target_include_directories(discord-rpc INTERFACE discord-rpc/include)
|
||||
|
||||
# GCN Headers
|
||||
add_subdirectory(gcn)
|
1
externals/discord-rpc
vendored
Submodule
1
externals/discord-rpc
vendored
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 80d35b5f86adc6557d0384771119cf167495dbae
|
Loading…
Add table
Add a link
Reference in a new issue