summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-08-13 19:34:40 +0100
committerAimee Linden <aimee@lindenlab.com>2010-08-13 19:34:40 +0100
commit5c6cb4c90666cdb3c665c2a193bbbca796b02652 (patch)
treeac28b403ceb0b08a51b0dbb5e1d259c4c4355c30 /indra/newview
parent73ca4eac149f24db26e5f412aca30a8d8ffe7fa6 (diff)
Persuade Windows to package the prebuilt llkdu.dll
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py6
1 files 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')