Skip to content
Snippets Groups Projects
Commit 2d2d4271 authored by Christian Goetze's avatar Christian Goetze
Browse files

QAR-1022 svn merge -r101843:102448...

parent a86aa7d8
No related branches found
No related tags found
No related merge requests found
...@@ -164,13 +164,16 @@ def construct(self): ...@@ -164,13 +164,16 @@ def construct(self):
# nor do we have a fixed name for the executable # 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()) 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 # 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. # *FIX:Mani we need to add support for packaging specific targets.
#'../llkdu/debug/llkdu.dll', #'../llkdu/debug/llkdu.dll',
'../llkdu/release/llkdu.dll', '../llkdu/release/llkdu.dll',
'../llkdu/relwithdebinfo/llkdu.dll', '../llkdu/relwithdebinfo/llkdu.dll',
'../../libraries/i686-win32/lib/release/llkdu.dll'), '../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll') dst='llkdu.dll')
except:
print "Skipping llkdu,.dll"
self.path(src="licenses-win32.txt", dst="licenses.txt") self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt") self.path("featuretable.txt")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment