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

Differentiate between 32/64 bit windows builds for build systewm (BugsSplat enforces specifc names that vary across bitness)

master
callum_linden 2017-10-19 18:35:00 -07:00
parent e75b16f358
commit 6cbb00fe85
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -244,9 +244,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f01c3cbeeeedf9efaf111c7b51fc3e5b</string>
<string>2710e051eb1b12dba574f470834baa9e</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9929/48024/bugsplat-3.5.0.5-windows-509917.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9992/49191/bugsplat-3.5.0.5-windows-509980.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -256,9 +256,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6878c5ac26ee1a7b8126d1c9f052e059</string>
<string>f2bb37c69f35522e49aae547d3408fd8</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9928/48018/bugsplat-3.5.0.5-windows64-509917.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9991/49185/bugsplat-3.5.0.5-windows64-509980.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>

2
indra/cmake/bugsplat.cmake
View File

@ -9,7 +9,7 @@ else (USESYSTEMLIBS)
use_prebuilt_binary(bugsplat)
if (WINDOWS)
set(BUGSPLAT_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat64.lib
${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib
)
elseif (DARWIN)

16
indra/newview/viewer_manifest.py
View File

@ -449,9 +449,14 @@ class WindowsManifest(ViewerManifest):
self.path("libhunspell.dll")
# BugSplat
self.path("BsSndRpt64.exe")
self.path("BugSplat64.dll")
self.path("BugSplatRc64.dll")
if(self.address_size == 64):
self.path("BsSndRpt64.exe")
self.path("BugSplat64.dll")
self.path("BugSplatRc64.dll")
else:
self.path("BsSndRpt.exe")
self.path("BugSplat.dll")
self.path("BugSplatRc.dll")
# For google-perftools tcmalloc allocator.
try:
@ -580,11 +585,6 @@ class WindowsManifest(ViewerManifest):
self.path("libvlccore.dll")
self.path("plugins/")
with self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'), dst=""):
self.path("BsSndRpt64.exe")
self.path("BugSplat64.dll")
self.path("BugSplatRc64.dll")
# pull in the crash logger and updater from other projects
# tag:"crash-logger" here as a cue to the exporter
self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],