From 5c6cb4c90666cdb3c665c2a193bbbca796b02652 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Fri, 13 Aug 2010 19:34:40 +0100
Subject: [PATCH] Persuade Windows to package the prebuilt llkdu.dll
---
indra/newview/viewer_manifest.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0b30128ff3..9cbc3f7b5e 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -257,14 +257,16 @@ class WindowsManifest(ViewerManifest):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
- self.enable_crt_manifest_check()
-
+ self.enable_no_crt_manifest_check()
+
# Get kdu dll, continue if missing.
try:
self.path('llkdu.dll', dst='llkdu.dll')
except RuntimeError:
print "Skipping llkdu.dll"
+ self.enable_crt_manifest_check()
+
# Get llcommon and deps. If missing assume static linkage and continue.
try:
self.path('llcommon.dll')
--
GitLab