From 363dea16509e75a9b7ffc18f4a310befdb947856 Mon Sep 17 00:00:00 2001 From: Nicky Date: Fri, 19 Feb 2016 23:21:55 +0100 Subject: [PATCH] Windows: Use external manifest. --- indra/newview/fs_viewer_manifest.py | 4 ++-- indra/newview/installers/windows_x64/firestorm.wxs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py index ca5a9aac60..a661910398 100644 --- a/indra/newview/fs_viewer_manifest.py +++ b/indra/newview/fs_viewer_manifest.py @@ -167,11 +167,11 @@ class FSViewerManifest: def fs_copy_windows_manifest(self): from shutil import copyfile self.fs_strip_windows_manifest( "%s/slplugin.exe" % self.args['configuration'].lower() ) - # self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() ) + self.fs_strip_windows_manifest( "%s/firestorm-bin.exe" % self.args['configuration'].lower() ) self.fs_strip_windows_manifest( "%s/llplugin/llceflib_host.exe" % self.args['configuration'].lower() ) if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst=""): self.path( "compatibility.manifest", "slplugin.exe.manifest" ) - # self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" ) + self.path( "compatibility.manifest", "firestorm-bin.exe.manifest" ) self.end_prefix() if self.prefix(src=os.path.join(os.pardir, '..', 'indra', 'tools', 'manifests'), dst="llplugin"): self.path( "compatibility.manifest", "llceflib_host.exe.manifest" ) diff --git a/indra/newview/installers/windows_x64/firestorm.wxs b/indra/newview/installers/windows_x64/firestorm.wxs index d33fe3439f..2a92c52caf 100644 --- a/indra/newview/installers/windows_x64/firestorm.wxs +++ b/indra/newview/installers/windows_x64/firestorm.wxs @@ -44,6 +44,7 @@ +