From f750406bd2fbce5e192377523f1b943ee86b6c41 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 15 Dec 2022 02:02:06 -0500
Subject: [PATCH] Fix build with linux discord
---
autobuild.xml | 12 ++++++------
indra/cmake/Copy3rdPartyLibs.cmake | 8 ++++++++
indra/cmake/DiscordSDK.cmake | 4 ++--
indra/newview/viewer_manifest.py | 4 ++--
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 54a92a20798..22b9a9dab95 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -476,11 +476,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>816e70283c4152a8b51731de350b235fcca3c80025a4d199cbdbb0e344b19985565131ac58348b7ba5d3f8f3ea0dd6729cbeb1b8f7db6483b5bb977fdf207663</string>
+ <string>1e47de39d3ee0b26d9e6b900a6b7ca80a7d84d5e3db33ccf0b1abf30a09e75c1c57d8423933f25fb931715a1c238cdf5f263b29ad07c7f416c108f1f869dcd1e</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1760/discord_gamesdk-3.2.1-darwin64-1760.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1764/discord_gamesdk-3.2.1-darwin64-1764.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -490,11 +490,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>7692d1cb707617e885967c5e210924bddd4d8e7c9e85dd012cef71bfa3a93901a19c6a20421a492930df11d95e02cb58f5a2a19e4850520824019be7faf0e927</string>
+ <string>94c2daadac705d0bf1d171e432118565f3047b8409f6d8667f8711c64122f3d1e7eeef4a30e8c81f943a469de746823688021766467abe6099c3a56f92ceef5c</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1760/discord_gamesdk-3.2.1-linux64-1760.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1764/discord_gamesdk-3.2.1-linux64-1764.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -504,11 +504,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e25ed20f0366b98ae0323b9a6f3071ab1d825dad55e03fba3ebca32a35412115c600f9658062bfb209f979880bdf8f9a694971fa9c48bbe64ab5ff8ed46f21b5</string>
+ <string>3783cdb9759cf5f4f924f3afeca576fb8cc4209608d7f4874b3285e1b9928ecda8a72cb040532f91058d9d31420106541a62de378e265cf7e3f4d1167a6fb5f8</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1760/discord_gamesdk-3.2.1-windows64-1760.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/191/packages/generic/discord-gamesdk/3.2.1.1764/discord_gamesdk-3.2.1-windows64-1764.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 378157180c1..5fc563a276b 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -214,6 +214,10 @@ elseif(DARWIN)
list(APPEND release_files libfmod.dylib)
endif (USE_FMODSTUDIO)
+ if(USE_DISCORD)
+ list(APPEND release_files discord_game_sdk.dylib)
+ endif()
+
elseif(LINUX)
# linux is weird, multiple side by side configurations aren't supported
# and we don't seem to have any debug shared libs built yet anyways...
@@ -254,6 +258,10 @@ elseif(LINUX)
list(APPEND release_files libfmod.so)
endif (USE_FMODSTUDIO)
+ if(USE_DISCORD)
+ list(APPEND release_files libdiscord_game_sdk.so)
+ endif()
+
else(WINDOWS)
message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
set(vivox_lib_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
diff --git a/indra/cmake/DiscordSDK.cmake b/indra/cmake/DiscordSDK.cmake
index 9fd27a9c75b..717ab0b040d 100644
--- a/indra/cmake/DiscordSDK.cmake
+++ b/indra/cmake/DiscordSDK.cmake
@@ -23,8 +23,8 @@ if (USE_DISCORD)
${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.dylib)
elseif (LINUX)
set(DISCORD_LIBRARY
- ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a
- ${ARCH_PREBUILT_DIRS_RELEASE}/discord_game_sdk.so)
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscord_game_sdk.so
+ optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libdiscordgamesdk.a)
endif (WINDOWS)
set(DISCORD_LIBRARIES ${DISCORD_LIBRARY})
set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord/)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d7f8afda7cc..2a6343028b2 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1225,7 +1225,7 @@ def construct(self):
self.path("libfmod.so*")
if self.args.get('discord'):
- self.path("discord_game_sdk.so")
+ self.path("libdiscord_game_sdk.so")
# Vivox runtimes
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
@@ -1266,7 +1266,7 @@ def construct(self):
self.path("libfmod.so*")
if self.args.get('discord'):
- self.path("discord_game_sdk.so")
+ self.path("libdiscord_game_sdk.so")
# Vivox runtimes
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
--
GitLab