diff options
| author | callum_linden <callum@lindenlab.com> | 2017-10-19 18:35:00 -0700 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-10-19 18:35:00 -0700 |
| commit | 6cbb00fe85df8cb01c3a979dbdf2c0354e7bfa4d (patch) | |
| tree | 47af1f93c2606fbf3c06958f05ba0929abf33ea4 /indra | |
| parent | e75b16f3584b76df706a470395383abf680eb87f (diff) | |
Differentiate between 32/64 bit windows builds for build systewm (BugsSplat enforces specifc names that vary across bitness)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/bugsplat.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index 6805465023..e993979902 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -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) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7292f715b7..4e69597b61 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -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'], |