From d02c4f05afc080073152cf557976366806bd689f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 15 Dec 2022 09:31:04 -0500
Subject: [PATCH] Fix building without discord
---
indra/newview/viewer_manifest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d7f8afda7cc..9103681da75 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -524,12 +524,12 @@ def construct(self):
self.path("ortp.dll")
# Sentry
- if self.args.get('sentry'):
+ if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
self.path("sentry.dll")
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
self.path("crashpad_handler.exe")
- if self.args.get('discord'):
+ if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("discord_game_sdk.dll")
self.path(src="licenses-win32.txt", dst="licenses.txt")
@@ -840,7 +840,7 @@ def construct(self):
):
self.path(libfile)
- if self.args.get('sentry'):
+ if self.args['sentry'] == 'ON' or self.args['sentry'] == 'TRUE':
self.path("Sentry.framework")
if self.args['openal'] == 'ON' or self.args['openal'] == 'TRUE':
@@ -856,7 +856,7 @@ def construct(self):
else:
self.path("libfmod.dylib")
- if self.args.get('discord'):
+ if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("discord_game_sdk.dylib")
with self.prefix(dst="MacOS"):
@@ -1224,7 +1224,7 @@ def construct(self):
if self.args['fmodstudio'] == 'ON' or self.args['fmodstudio'] == 'TRUE':
self.path("libfmod.so*")
- if self.args.get('discord'):
+ if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("discord_game_sdk.so")
# Vivox runtimes
@@ -1265,7 +1265,7 @@ def construct(self):
if self.args['fmodstudio'] == 'ON' or self.args['fmodstudio'] == 'TRUE':
self.path("libfmod.so*")
- if self.args.get('discord'):
+ if self.args['discord'] == 'ON' or self.args['discord'] == 'TRUE':
self.path("discord_game_sdk.so")
# Vivox runtimes
--
GitLab