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

further little tweak so that viewer_manifest.py survives mangling by the open source export

meow-7.2.2
Christian Goetze 2009-02-04 08:31:03 +00:00
parent 5edacb93dd
commit 6b7b75e9cb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/viewer_manifest.py
View File

@ -166,8 +166,7 @@ class WindowsManifest(ViewerManifest):
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
try:
self.path(self.find_existing_file(
'../llkdu/%s/llkdu.dll' % self.args['configuration'],
self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
'../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll')
pass
@ -626,8 +625,7 @@ class Linux_i686Manifest(LinuxManifest):
# install either the libllkdu we just built, or a prebuilt one, in
# decreasing order of preference. for linux package, this goes to bin/
try:
self.path(self.find_existing_file(
'../llkdu/libllkdu.so',
self.path(self.find_existing_file('../llkdu/libllkdu.so',
'../../libraries/i686-linux/lib_release_client/libllkdu.so'),
dst='bin/libllkdu.so')
# keep this one to preserve syntax, open source mangling removes previous lines