diff options
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
-rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index c13cf1a..fd5af9d 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -260,21 +260,17 @@ class WindowsManifest(ViewerManifest): | |||
260 | except: | 260 | except: |
261 | print "Can't save symbol file %s, skipping" % (symbol_path) | 261 | print "Can't save symbol file %s, skipping" % (symbol_path) |
262 | pass | 262 | pass |
263 | 263 | ||
264 | self.gather_documents() | 264 | self.gather_documents() |
265 | 265 | ||
266 | if self.prefix("../..", dst="doc"): | 266 | if self.prefix("../..", dst="doc"): |
267 | self.path("LICENSE-libraries.txt") | 267 | self.path("LICENSE-libraries.txt") |
268 | self.end_prefix("../..") | 268 | self.end_prefix("../..") |
269 | 269 | ||
270 | |||
271 | self.path("imprudence.url") | 270 | self.path("imprudence.url") |
272 | 271 | ||
273 | # Plugin host application | 272 | # Plugin host application |
274 | self.path(os.path.join(os.pardir, | 273 | self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe") |
275 | 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), | ||
276 | "SLPlugin.exe") | ||
277 | |||
278 | 274 | ||
279 | self.path("featuretable.txt") | 275 | self.path("featuretable.txt") |
280 | 276 | ||
@@ -283,13 +279,13 @@ class WindowsManifest(ViewerManifest): | |||
283 | 279 | ||
284 | # For using FMOD for sound... DJS | 280 | # For using FMOD for sound... DJS |
285 | #self.path("fmod.dll") | 281 | #self.path("fmod.dll") |
286 | 282 | ||
287 | # For spellchecking | 283 | # For spellchecking |
288 | if self.prefix(src=self.args['configuration'], dst=""): | 284 | if self.prefix(src=self.args['configuration'], dst=""): |
289 | self.path("libhunspell.dll") | 285 | self.path("libhunspell.dll") |
290 | self.end_prefix() | 286 | self.end_prefix() |
291 | 287 | ||
292 | # Copy the llkdu DSO .config | 288 | # Copy the llkdu DSO .config |
293 | self.path("llkdu.dll.2.config") | 289 | self.path("llkdu.dll.2.config") |
294 | 290 | ||
295 | # Get llcommon and deps. | 291 | # Get llcommon and deps. |
@@ -309,7 +305,7 @@ class WindowsManifest(ViewerManifest): | |||
309 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): | 305 | if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): |
310 | self.path("openal32.dll") | 306 | self.path("openal32.dll") |
311 | self.path("alut.dll") | 307 | self.path("alut.dll") |
312 | self.end_prefix() | 308 | self.end_prefix() |
313 | 309 | ||
314 | # Media plugins - QuickTime | 310 | # Media plugins - QuickTime |
315 | if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): | 311 | if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): |