Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback to old method of bundling MS C runtime, if automatic one fails

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-29 16:06:56 +01:00
parent f1ee3a0834
commit 2c99e07b93
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/viewer_manifest.py
View File

@@ -302,35 +302,16 @@ class WindowsManifest(ViewerManifest):
if not self.is_win64(): if not self.is_win64():
self.path(release_lib_dir+"/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll") self.path(release_lib_dir+"/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll")
#try:
# if self.prefix(release_lib_dir+"/msvcrt", dst=""):
# self.path("*.dll")
# self.path("*.manifest")
# self.end_prefix()
#except:
# pass
try: try:
self.path("msvc*.dll") self.path("msvc*.dll")
except: except:
pass try:
if self.prefix(release_lib_dir+"/msvcrt", dst=""):
self.path("*.dll")
# These need to be installed as a SxS assembly, currently a 'private' assembly. self.path("*.manifest")
# See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx self.end_prefix()
#~ if self.prefix(src=self.args['configuration'], dst=""): except:
#~ if self.args['configuration'] == 'Debug': pass
#~ self.path("msvcr80d.dll")
#~ self.path("msvcp80d.dll")
#~ self.path("Microsoft.VC80.DebugCRT.manifest")
#~ else:
#~ self.path("msvcr80.dll")
#~ self.path("msvcp80.dll")
#~ self.path("Microsoft.VC80.CRT.manifest")
#~ self.end_prefix()
# The config file name needs to match the exe's name.
#~ self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
# Vivox runtimes # Vivox runtimes
if self.prefix(src="vivox-runtime/i686-win32", dst=""): if self.prefix(src="vivox-runtime/i686-win32", dst=""):