summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2026-06-01 16:35:49 +0700
committerErik Kundiman <erik@megapahit.org>2026-06-01 16:35:49 +0700
commitff6c1f118a27b91d8a9983056a83642fbecfac8a (patch)
tree5c1021e1b3add7155e8bd2a660091ba43e407444
parent3441a57e91f607b8beaa12424bcf71117cedade2 (diff)
Upgrade Discord Social SDKHEADmain
There are binaries for Win arm64 too now.
-rw-r--r--indra/cmake/Discord.cmake9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index f474457b03..68e6f59ecb 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -9,7 +9,7 @@ target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1)
if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_sdk_installed OR NOT ${discord_sdk_installed} EQUAL 0)
file(ARCHIVE_EXTRACT
- INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.8.13395.zip
+ INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.9.15780.zip
DESTINATION ${CMAKE_BINARY_DIR}
)
file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/discord_sdk)
@@ -19,9 +19,12 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
${CMAKE_BINARY_DIR}/discord_social_sdk/include/discordpp.h
DESTINATION ${LIBS_PREBUILT_DIR}/include/discord_sdk
)
+ if ($ENV{MSYSTEM_CARCH} MATCHES aarch64)
+ set(DISCORD_PLATFORM /arm64)
+ endif ()
if (WINDOWS)
file(
- COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/bin/release/discord_partner_sdk.dll
+ COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/bin/release${DISCORD_PLATFORM}/discord_partner_sdk.dll
DESTINATION ${LIBS_PREBUILT_DIR}/bin/release
)
set(LIBRARY_EXTENSION lib)
@@ -39,7 +42,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
)
else ()
file(
- COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/lib/release/${LIBRARY_PREFIX}discord_partner_sdk.${LIBRARY_EXTENSION}
+ COPY ${CMAKE_BINARY_DIR}/discord_social_sdk/lib/release${DISCORD_PLATFORM}/${LIBRARY_PREFIX}discord_partner_sdk.${LIBRARY_EXTENSION}
DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
)
endif ()