diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-08-05 09:33:19 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-05 18:26:29 +0300 |
| commit | c26749750998c2efaa5208b83bc48d65dfa60274 (patch) | |
| tree | c46c6b1f7d9c493134c9d1be71e312e0ac3c1690 | |
| parent | 8eb2429a16b7dee570a28578f3d75f2a423f20af (diff) | |
#4470 Adjustments and Mac build fixes
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/Discord.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index de41918a34..0153e69d5b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -6,7 +6,9 @@ include(CMakeCopyIfDifferent) include(Linking) -include(Discord) +if (USE_DISCORD) + include(Discord) +endif () include(OPENAL) # When we copy our dependent libraries, we almost always want to copy them to diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake index d15b4041b1..95cfaacf5b 100644 --- a/indra/cmake/Discord.cmake +++ b/indra/cmake/Discord.cmake @@ -1,5 +1,7 @@ include(Prebuilt) +include_guard() + add_library(ll::discord_sdk INTERFACE IMPORTED) target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4760ba5a6f..04c3fea93a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1022,7 +1022,7 @@ class Darwin_x86_64_Manifest(ViewerManifest): self.path2basename(relpkgdir, libfile) # Discord social SDK - if self.args['DISCORD'] == 'ON': + if self.args['discord'] == 'ON': for libfile in ( "libdiscord_partner_sdk.dylib", ): |