Mirrors/Citron
1
0
Fork 0
mirror of https://git.citron-emu.org/Citron/Citron.git synced 2025-03-10 17:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: compilation errors with Qt and Discord RPC

Browse source 
- Downgrade Qt version from 6.8.1 to 6.7.3 as 6.8.1 is not yet widely available
- Add USE_DISCORD_PRESENCE check around discord-rpc compile options to prevent
  build errors when Discord integration is disabled
This commit is contained in:
Zephyron 2025-02-02 09:20:11 +10:00
parent 44944c4d80
commit 19ce9d695e
No known key found for this signature in database
GPG key ID: 2177ADED8AC966AF
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -419,7 +419,7 @@ add_subdirectory(externals)
if (ENABLE_QT) if (ENABLE_QT)
if (NOT USE_SYSTEM_QT) if (NOT USE_SYSTEM_QT)
download_qt(6.8.1) download_qt(6.7.3)
endif() endif()
find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent Network) find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent Network)
@ -674,4 +674,6 @@ if(ENABLE_QT AND UNIX AND NOT APPLE)
DESTINATION "share/metainfo") DESTINATION "share/metainfo")
endif() endif()
if (USE_DISCORD_PRESENCE)
target_compile_options(discord-rpc PRIVATE -fpermissive) target_compile_options(discord-rpc PRIVATE -fpermissive)
endif()