livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAR-1022 svn merge -r101843:102448 svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release

meow-7.2.2
Christian Goetze 2008-11-18 21:58:42 +00:00
parent a86aa7d8b0
commit 2d2d427158
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/viewer_manifest.py
View File

@ -164,13 +164,16 @@ class WindowsManifest(ViewerManifest):
# nor do we have a fixed name for the executable
self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe())
# need to get the kdu dll from any of the build directories as well
self.path(self.find_existing_file(
try:
self.path(self.find_existing_file(
# *FIX:Mani we need to add support for packaging specific targets.
#'../llkdu/debug/llkdu.dll',
'../llkdu/release/llkdu.dll',
'../llkdu/relwithdebinfo/llkdu.dll',
'../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll')
except:
print "Skipping llkdu,.dll"
self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt")