c0adc5e181
SL-17376 Fix viewer failing due to missing vcruntime140_1
2022-05-09 21:22:22 +03:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02:00
6b2e40157b
Merge branch 'master' v6.4.24 into DRTVWR-546
2021-10-13 16:41:24 -06:00
b4bb74c5de
SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha)
2021-09-22 21:37:01 +00:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
b91561e982
SL-15211 Update OpenSSL library
2021-05-27 12:56:35 +03:00
fd1545197a
SL-10297: Merge branch 'sl-10297-oz' into sl-10297.
...
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
2021-05-12 13:56:19 -04:00
789be6b933
Merge branch 'master' into DRTVWR-520-apple-notarization
2021-04-30 03:05:19 +03:00
2febf90744
SL-14541 follow-up xcode buildfix
2021-03-17 08:53:20 +02:00
2f00eef6b4
SL-14597 Fixed mac library only including symlink
2021-01-16 13:16:12 +02:00
3d525fbf18
SL-14597 Pulled in updated uriparser
...
Due to crash inside uriparser's code
2021-01-16 01:06:16 +02:00
a9d271c5a2
SL-10297 merged 6.4.7
2020-08-24 13:11:07 -04:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
cd6f7a4e6f
Mac buildfix
2020-07-22 13:37:33 +03:00
86009f885e
SL-10297: merge up to master at 6.4.3
2020-06-15 15:29:04 -04:00
363e9c949b
Merge branch 'master' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2020-06-02 23:15:38 +03:00
50a8c2e41a
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
2020-06-02 16:05:56 -04:00
b08c44a0dc
DRTVWR-476, SL-12205: Refactor MSVC redist library copying.
...
Specify all of msvcp$VER.dll, msvcr$VER.dll and vcruntime$VER.dll -- but check
each of them individually, because any given VS release has only a subset of
those. Add messaging to clarify what we're doing.
Introduce to_staging_dirs CMake macro to cut down on redundant boilerplate:
the idiom in which we use copy_if_different twice, once to the Release staging
directory and once to the RelWithDebInfo staging directory, each time
appending the target pathnames to third_party_targets. Replace that idiom with
calls to to_staging_dirs.
2020-03-25 19:06:12 -04:00
44b9dd2e80
DRTVWR-476, SL-12205: Search for msvcp140.dll, not msvcr140.dll
...
Evidently, with VS 2017, what would have been msvcr140.dll has become
vcruntime140.dll instead. msvcr140.dll is no longer a good sample DLL for
which to search.
2020-03-25 19:06:12 -04:00
70a63ca331
DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs.
2020-03-25 19:06:12 -04:00
5f1140c03c
DRTVWR-476: For VS 2017, MSVC_VERSION can be any of a range.
...
Thanks NickyD.
2020-03-25 19:06:12 -04:00
d43dcc50c5
DRTVWR-476: We've observed a couple different values for VS 2017.
2020-03-25 18:58:16 -04:00
3a7d401364
DRTVWR-476: On Mac, copy libhunspell-1.3.0.dylib for test programs.
2020-03-25 18:44:04 -04:00
fc09af763c
[DRTVWR-476] - update openjpeg
2020-03-25 18:39:20 -04:00
65b268ff86
[DRTVWR-476] - fix openjpeg dll path
2020-03-25 18:39:20 -04:00
e335fde00d
[DRTVWR-476] - fix msvc version
2020-03-25 16:27:35 -04:00
e849dfb9fa
DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version.
...
Also, on Windows, put build output into
build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding
build-vc120-$AUTOBUILD_ADDRSIZE.
2020-03-25 16:08:43 -04:00
b99fcdb30a
SL-12707 Build Fails Without FMOD
...
Also adds correct working directory to RelWithDebInfoOS and enables OpenAl on OS builds for windows
2020-02-14 13:34:07 +02:00
6627d684a2
SL-12654 Remove support for building with fmod ex
2020-02-04 17:12:19 +02:00
192aee0f19
Merged in SL-11445 Upgrade Fmodex to Fmod Studio
2020-01-31 15:05:51 +00:00
b74f698caa
handle slvoice executable separately from the vivox libraries, and update mac slvoice package
2019-09-06 11:51:36 -04:00
4cbef35f50
update Vivox for VOICE-56
2019-07-16 18:17:23 -04:00
e409c0492f
convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach
2019-03-02 11:58:11 -05:00
c2178bb6ac
DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.
...
Define the CMake cache variable, with empty string as its default.
Make build.sh pass the BUGSPLAT_DB environment variable as a CMake
command-line variable assignment.
Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'.
Make CMake pass new --bugsplat switch to every one of SIX different
invocations of viewer_manifest.py.
Give llmanifest.main() function an argument to allow supplementing the base
set of command-line switches with additional application-specific switches.
In viewer_manifest.py, define new --bugsplat command-line switch and pass to
llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult
self.args['bugsplat'].
2018-08-24 09:56:56 -04:00
8781b36d7e
SL-821: export BUGSPLAT_DB when loaded so child processes can detect.
...
Produce CMake message when BugSplat is engaged so we can detect in build log.
Don't try to copy BugSplat DLLs when NOT engaged.
2018-05-25 16:08:00 -04:00
6c953d0bde
Automated merge with tip of viewer-release after Viewer Media Update release
2018-04-12 15:22:25 -07:00
4181b1d9e2
correct 64bit vivox dll names
2018-01-18 12:49:54 -05:00
96d28ad5a7
more places where vivox names must be conditional on address size
2018-01-18 10:15:15 -05:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
dd0d2805e2
Automated erge with tip of viewer64
2017-11-30 14:44:44 -08:00
762582c499
MAINT-7081: Mention libnghttp2*.dylib in yet another place.
2017-10-24 15:38:00 -04:00
0ee774c39f
Missed a place in the Copy3rdPartyLibs.cmake file (thank Windows Find) that needs to differentiate between 32 and 64 bit Windows builds
2017-10-23 11:37:06 -07:00
803b75a718
First version that builds with a dummy BugSplay call in llapp.cpp
2017-10-18 18:36:10 -07:00
ee2a1902a5
MAINT-7081: Mention nghttp2.dll where it must be mentioned.
2017-09-29 08:46:44 -04:00
19bb6fd33e
MAINT-7081: Mention nghttp2 library wherever it must be mentioned.
2017-09-27 15:27:30 -04:00
c538ff12c5
SL-700: temporarily use local version of ca-bundle.crt instead of from voice, misc cleanup
2017-06-14 14:16:23 -07:00
7005310541
Fix MAINT-7360 Investigate removal of MSVCR100.DLL and MSVCP100.DLL
2017-05-01 12:42:12 -07:00
cb07ca3510
Fix for MAINT-7131 Unable to start the x64 Viewer on Windows 8.1 x64. This appears to be because two of the MS DLLs we ship with the 64 bit viewer are 32bit. Manually replacing them with their 64 bit equivalents allowed the viewer to start on Windows 8.1. The change forces the cmake file which copies the DLLs to look in C:\windows\SysWOW64 for 32 bit versions and C:\windows\system32 for 64 bit versions. (yes really).
2017-03-27 17:11:00 -07:00
771c7dd3c0
DRTVWR-418: Update some copy commands for 3p library versions.
2016-12-10 12:12:51 -05:00
Andrey Kleshchev