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

Merge.

Nicky 2016-02-21 22:34:05 +01:00
parent 6c9f85bb27 363dea1650
commit b2eba7b2e0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fs_viewer_manifest.py
View File

@ -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" )

1
indra/newview/installers/windows_x64/firestorm.wxs
View File

@ -44,6 +44,7 @@
<Component Id="firestorm" Guid="{2CDF0673-595F-4fb4-B38A-C338BF9D4DF1}">
<File Id="firestorm" Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE)" KeyPath="yes"/>
<File Id="firestorm_manifest" Source="$(var.BUILDDIR)/$(var.PROGRAM_FILE).manifest" CompanionFile="firestorm"/>
<File Source="$(var.BUILDDIR)/win_crash_logger.exe" CompanionFile="firestorm" />
<File Source="$(var.BUILDDIR)/fmodex64.dll" CompanionFile="firestorm" />