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

Dullupdate: Fix not shutting down properly?

Browse Source 
TODO: Rebuild on Linux
This commit is contained in:
Lirusaito
2019-04-10 11:28:54 -04:00
parent 27ed3ca4b9
commit 5e1a102de4
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
autobuild.xml
View File

@@ -594,24 +594,22 @@
<key>license</key>
<string>MPL</string>
<key>license_file</key>
<string>LICENSES/dullahan.txt</string>
<string>LICENSES/LICENSE.txt</string>
<key>name</key>
<string>dullahan</string>
<key>platforms</key>
<map>
<key>darwin</key>
<key>darwin64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>e447c0799438b1be850d7b589308d394</string>
<key>hash_algorithm</key>
<string>md5</string>
<string>118987b1a5b56214cfdbd0c763e180da</string>
<key>url</key>
<string>https://bitbucket.org/SingularityViewer/libraries/downloads/dullahan-1.1.1085-3.3497.1833.g13f506f-darwin-201902131231.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
@@ -632,9 +630,7 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c3e093d40e93ff242e9b9c953ae7316c</string>
<key>hash_algorithm</key>
<string>md5</string>
<string>2ecc71350b30a1057091b9cd7af18b1c</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows/lib-vc142/dullahan-1.1.930-3.3282.1733.g9091548-windows-201802202358.tar.bz2</string>
</map>
@@ -646,18 +642,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9c9696168fcb640feb7d64988a759b25</string>
<string>414190fd1ce3876ee3efc682b06ae65c</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows64/lib-vc1415/dullahan-1.1.1085-3.3497.1833.g13f506f-windows64-201809230539.tar.bz2</string>
<string>http://depot.alchemyviewer.org/pub/packages/windows64/msvc-1920/dullahan-1.1.1320_73.1.12-gee4b49f-chromium-73.0.3683.75-windows64-190871757.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.1.1085-3.3497.1833.g13f506f</string>
<string>1.1.1320_73.1.12+gee4b49f+chromium-73.0.3683.75</string>
</map>
<key>elfio</key>
<map>

6
indra/newview/viewer_manifest.py
View File

@@ -375,6 +375,7 @@ class WindowsManifest(ViewerManifest):
config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release'
if self.prefix(src=os.path.join(pkgdir, 'bin', config), dst="llplugin"):
self.path("chrome_elf.dll")
self.path("d3dcompiler_43.dll")
self.path("d3dcompiler_47.dll")
self.path("libcef.dll")
self.path("libEGL.dll")
@@ -383,18 +384,13 @@ class WindowsManifest(ViewerManifest):
self.path("natives_blob.bin")
self.path("snapshot_blob.bin")
self.path("v8_context_snapshot.bin")
self.path("widevinecdmadapter.dll")
self.end_prefix()
# CEF runtime files for software rendering - debug
# CEF runtime files for software rendering - not debug (release, relwithdebinfo etc.)
if self.prefix(src=os.path.join(pkgdir, 'bin', config, 'swiftshader'), dst=os.path.join("llplugin", 'swiftshader')):
self.path("libEGL.dll")
self.path("libGLESv2.dll")
self.end_prefix()
# CEF files common to all configurations
if self.prefix(src=os.path.join(pkgdir, 'resources'), dst="llplugin"):
self.path("cef.pak")