Skip to content
Snippets Groups Projects
Commit 0285e879 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan
Browse files

svn merge -r89446:89445 indra/newview/viewer_manifest.py

parent c9ce5922
No related branches found
No related tags found
No related merge requests found
...@@ -402,8 +402,7 @@ def construct(self): ...@@ -402,8 +402,7 @@ def construct(self):
self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib") self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
#libfmodwrapper.dylib #libfmodwrapper.dylib
self.path('fmodwrapper/%s/libfmodwrapper.dylib' % self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
self.args['configuration'], 'libfmodwrapper.dylib')
# command line arguments for connecting to the proper grid # command line arguments for connecting to the proper grid
self.put_in_file(self.flags_list(), 'arguments.txt') self.put_in_file(self.flags_list(), 'arguments.txt')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment