summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-24 15:40:49 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-24 15:40:49 -0700
commitb3e10e872f2f6141e7f75fb1ea08717cbac0e099 (patch)
tree7be2e4c6a137ebf86683af9ebd0b976d487d991e /indra/newview/viewer_manifest.py
parent1de433aa8cda814dbfd0ce51a3ec5dea111aadd0 (diff)
Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dll
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rw-r--r--indra/newview/viewer_manifest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0eda4007e3..e963bcc9f7 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -251,7 +251,7 @@ class WindowsManifest(ViewerManifest):
if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']),
dst=""):
- self.enable_no_crt_manifest_check()
+ self.enable_crt_manifest_check()
# Get kdu dll, continue if missing.
try:
@@ -259,8 +259,6 @@ class WindowsManifest(ViewerManifest):
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')