archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

changed discord-rpc to discordRPC

Browse source
This commit is contained in:
p01arst0rm 2021-05-03 23:05:11 +01:00 • committed by Megamouse
parent f27325fd98
commit 35ee550171
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
3rdparty/CMakeLists.txt vendored
View file

@ -179,7 +179,7 @@ add_library(3rdparty_stblib INTERFACE)
target_include_directories(3rdparty_stblib INTERFACE stblib/include) target_include_directories(3rdparty_stblib INTERFACE stblib/include)
# discord rpc # DiscordRPC
add_subdirectory(discord-rpc) add_subdirectory(discord-rpc)
@ -394,7 +394,7 @@ add_library(3rdparty::cereal ALIAS 3rdparty_cereal)
add_library(3rdparty::opengl ALIAS 3rdparty_opengl) add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
add_library(3rdparty::span ALIAS 3rdparty_span) add_library(3rdparty::span ALIAS 3rdparty_span)
add_library(3rdparty::stblib ALIAS 3rdparty_stblib) add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc) add_library(3rdparty::discordRPC ALIAS 3rdparty_discordRPC)
add_library(3rdparty::alsa ALIAS ${ALSA_TARGET}) add_library(3rdparty::alsa ALIAS ${ALSA_TARGET})
add_library(3rdparty::pulse ALIAS ${PULSE_TARGET}) add_library(3rdparty::pulse ALIAS ${PULSE_TARGET})
add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET}) add_library(3rdparty::faudio ALIAS ${FAUDIO_TARGET})

14
3rdparty/discord-rpc/CMakeLists.txt vendored
View file

@ -1,10 +1,10 @@
# discord_rpc # DiscordRPC
add_library(3rdparty_discord-rpc INTERFACE) add_library(3rdparty_discordRPC INTERFACE)
# We don't want Discord Rich Presence on the BSDs and other OSes # We don't want Discord Rich Presence on the BSDs and other OSes
if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE)) if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
if (WIN32 AND NOT MSVC) if (WIN32 AND NOT MSVC)
ExternalProject_Add(discord-rpc ExternalProject_Add(discordRPC
GIT_REPOSITORY https://github.com/discordapp/discord-rpc GIT_REPOSITORY https://github.com/discordapp/discord-rpc
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
INSTALL_COMMAND "" INSTALL_COMMAND ""
@ -12,8 +12,8 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
endif() endif()
target_include_directories(3rdparty_discord-rpc INTERFACE include) target_include_directories(3rdparty_discordRPC INTERFACE include)
target_compile_definitions(3rdparty_discord-rpc INTERFACE -DWITH_DISCORD_RPC) target_compile_definitions(3rdparty_discordRPC INTERFACE -DWITH_DISCORD_RPC)
set(DISCORD_RPC_LIB NOTFOUND) set(DISCORD_RPC_LIB NOTFOUND)
if (WIN32) if (WIN32)
@ -27,8 +27,8 @@ if (USE_DISCORD_RPC AND (WIN32 OR CMAKE_SYSTEM MATCHES "Linux" OR APPLE))
elseif(APPLE) elseif(APPLE)
find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH) find_library(DISCORD_RPC_LIB discord-rpc-mac PATHS lib/ NO_DEFAULT_PATH)
endif() endif()
target_link_libraries(3rdparty_discord-rpc INTERFACE ${DISCORD_RPC_LIB}) target_link_libraries(3rdparty_discordRPC INTERFACE ${DISCORD_RPC_LIB})
if(APPLE) if(APPLE)
target_link_libraries(3rdparty_discord-rpc INTERFACE "objc" "-framework Foundation" "-framework CoreServices") target_link_libraries(3rdparty_discordRPC INTERFACE "objc" "-framework Foundation" "-framework CoreServices")
endif() endif()
endif() endif()

2
rpcs3/CMakeLists.txt
View file

@ -85,7 +85,7 @@ set_target_properties(rpcs3
AUTOUIC ON) AUTOUIC ON)
target_link_libraries(rpcs3 rpcs3_emu rpcs3_ui) target_link_libraries(rpcs3 rpcs3_emu rpcs3_ui)
target_link_libraries(rpcs3 3rdparty::discord-rpc 3rdparty::qt5 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl) target_link_libraries(rpcs3 3rdparty::discordRPC 3rdparty::qt5 3rdparty::hidapi 3rdparty::libusb 3rdparty::wolfssl 3rdparty::libcurl)
target_link_libraries(rpcs3 ${ADDITIONAL_LIBS}) target_link_libraries(rpcs3 ${ADDITIONAL_LIBS})
# Win resource file # Win resource file

2
rpcs3/rpcs3qt/CMakeLists.txt
View file

@ -105,7 +105,7 @@ target_link_libraries(rpcs3_ui
PRIVATE PRIVATE
rpcs3_emu rpcs3_emu
3rdparty::zlib 3rdparty::pugixml 3rdparty::zlib 3rdparty::pugixml
3rdparty::discord-rpc 3rdparty::discordRPC
3rdparty::hidapi 3rdparty::hidapi
3rdparty::libusb 3rdparty::libusb
3rdparty::libpng 3rdparty::libpng