From 0eedd1d9e8490ae771c8ea4af5c412d95385c800 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Wed, 23 Sep 2009 19:46:36 -0400
Subject: Oops libtcmalloc_minimal.dll was being packaged in a subdir it
shouldn't have been.
---
indra/newview/viewer_manifest.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index af3868394b..f62ed4b374 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -306,11 +306,15 @@ class WindowsManifest(ViewerManifest):
dst="updater.exe")
# For google-perftools tcmalloc allocator.
- try:
- self.path('%s/libtcmalloc_minimal.dll' % self.args['configuration'])
- except:
- print "Skipping libtcmalloc_minimal.dll"
- pass
+ if self.prefix(src=self.args['configuration'], dst=""):
+ try:
+ if self.args['configuration'] == 'Debug':
+ self.path('libtcmalloc_minimal-debug.dll')
+ else:
+ self.path('libtcmalloc_minimal.dll')
+ except:
+ print "Skipping libtcmalloc_minimal.dll"
+ self.end_prefix()
def nsi_file_commands(self, install=True):
def wpath(path):
--
cgit v1.2.3