summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar liamwhite2023-10-14 09:58:33 -0400
committerGravatar GitHub2023-10-14 09:58:33 -0400
commit1a4abd184f8085f29a18453bdc4aabb3c038907a (patch)
treea7c5f8fe4070f34d9433ad0576a7be6bc04c7488
parentMerge pull request #11779 from flodavid/improve-player-config-click (diff)
parentRevert "cmake: only add network component if qt used" (diff)
downloadyuzu-1a4abd184f8085f29a18453bdc4aabb3c038907a.tar.gz
yuzu-1a4abd184f8085f29a18453bdc4aabb3c038907a.tar.xz
yuzu-1a4abd184f8085f29a18453bdc4aabb3c038907a.zip
Merge pull request #11780 from Darkness4/master
qt: add network components when using discord
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/yuzu/CMakeLists.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1108e5ae6..166024844 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,6 +360,9 @@ function(set_yuzu_qt_components)
360 if (ENABLE_QT_TRANSLATION) 360 if (ENABLE_QT_TRANSLATION)
361 list(APPEND YUZU_QT_COMPONENTS2 LinguistTools) 361 list(APPEND YUZU_QT_COMPONENTS2 LinguistTools)
362 endif() 362 endif()
363 if (USE_DISCORD_PRESENCE)
364 list(APPEND YUZU_QT_COMPONENTS2 Network)
365 endif()
363 set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE) 366 set(YUZU_QT_COMPONENTS ${YUZU_QT_COMPONENTS2} PARENT_SCOPE)
364endfunction(set_yuzu_qt_components) 367endfunction(set_yuzu_qt_components)
365 368
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 9ebece907..34208ed74 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -384,7 +384,7 @@ if (USE_DISCORD_PRESENCE)
384 discord_impl.cpp 384 discord_impl.cpp
385 discord_impl.h 385 discord_impl.h
386 ) 386 )
387 target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib) 387 target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc httplib::httplib Qt${QT_MAJOR_VERSION}::Network)
388 target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE) 388 target_compile_definitions(yuzu PRIVATE -DUSE_DISCORD_PRESENCE)
389endif() 389endif()
390 390