add discord support for all missing systems

This commit is contained in:
Laserlicht
2026-03-15 11:36:07 +01:00
parent 5866d39e40
commit 7a02c7acd7
3 changed files with 15 additions and 10 deletions
+2 -1
View File
@@ -15,4 +15,5 @@
url = https://github.com/vcmi/vcmi-dependencies.git url = https://github.com/vcmi/vcmi-dependencies.git
[submodule "client/lib/discord-presence"] [submodule "client/lib/discord-presence"]
path = client/lib/discord-presence path = client/lib/discord-presence
url = https://github.com/EclipseMenu/discord-presence.git url = https://github.com/vcmi/discord-presence.git
branch = vcmi
+12 -8
View File
@@ -112,15 +112,19 @@ else()
else() else()
check_cxx_compiler_flag("-std=c++23" COMPILER_SUPPORTS_CXX23) check_cxx_compiler_flag("-std=c++23" COMPILER_SUPPORTS_CXX23)
endif() endif()
if(COMPILER_SUPPORTS_CXX23 # C++23 features needed
AND (MACOS option(ENABLE_DISCORD "Enable compilation of discord integration" ON)
AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" # skip intel for apple (compile issue)
OR NOT MACOS # Determine if Glaze can be used
OR CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL "10.15") # allow it if we have proper deployment target set(DISCORD_RPC_NO_GLAZE OFF)
if(
(MACOS AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.15")
OR
(IOS AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "13.0")
OR
(NOT COMPILER_SUPPORTS_CXX23)
) )
option(ENABLE_DISCORD "Enable compilation of discord integration" ON) set(DISCORD_RPC_NO_GLAZE ON)
else()
option(ENABLE_DISCORD "Enable compilation of discord integration" OFF)
endif() endif()
endif() endif()