24231e7a71
Merge voice-56
2019-10-18 18:13:32 +02: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
dd05edde98
FMOD Studio 2.00.01 for Windows
2019-06-08 15:00:23 +02: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
6bd724e65a
Merge viewer-bugsplat
2018-08-31 09:17:34 +02:00
0f121d042d
Merge viewer-bugsplat
2018-07-27 11:19:42 +02: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
3ebe1396c9
Fix another merge issue
2018-05-04 22:36:39 +02:00
89b4e0b251
Merge.
2018-04-15 17:36:54 +02:00
6aafa01f66
Fffffffft Linux...
2018-04-14 01:49:37 +02:00
4530d10b7c
Remove OpenJPEG2 support for now - LL is updating to OpenJPEG2 in the texture cache overhaul viewer
2018-04-13 23:04:06 +02:00
6c953d0bde
Automated merge with tip of viewer-release after Viewer Media Update release
2018-04-12 15:22:25 -07:00
062d6e3f2e
Use glod as a statically linked library.
2018-04-09 14:23:58 +02:00
dc2efd2495
Merge LL viewer release 5.1.1
2018-02-12 20:04:32 +01:00
1a788686ad
Merge Firestorm LGPL
2018-02-12 19:59:48 +01:00
ade69f0d60
Autobuild and cmake configuration fixes for Linux standalone builds.
2018-02-10 19:01:12 -06: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
9b07bbe4fc
Fix Vivox packaging for 64bit Windows
2018-01-17 21:30:03 +01:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
6d6111814a
Merge Firestorm LGPL
2018-01-16 22:55:49 +01:00
80240fcfd5
Merge Firestorm LGPL
2018-01-16 20:26:05 +01:00
20bffceffd
Merge Firestorm LGPL
2018-01-09 14:11:28 +01:00
1c1e13ee55
Merge Firestorm LGPL
2018-01-04 15:59:39 +01:00
5e1c9a92a8
Add support for FMOD Studio, originally by Drake Arconis (Alchemy Viewer), with FS-specific additions by Drakeo
2017-12-16 19:34:03 +01:00
6cd9561cd9
Replace ND_BUILD64BIT_ARCH with ADDRESS_SIZE
2017-12-08 12:39:54 +01:00
d4ca26c4c8
Merge Firestorm LGPL
2017-12-08 12:38:39 +01:00
85a01ea062
FIRE-21917: Fix linking against wrong FmodEx library on Linux64, patch by Lord Drakeo
2017-12-08 12:12:57 +01:00
dd0d2805e2
Automated erge with tip of viewer64
2017-11-30 14:44:44 -08:00
5d6794ad36
Simplify copying of FMOD Studio libs on Linux
2018-01-10 23:12:08 +01:00
2e3d7676f5
Add fmod studio for linux
2018-01-09 20:06:48 -08:00
32cbc9f98b
Merge viewer64
2017-11-05 12:46:02 +01: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
ee53caeb11
Fix copying MSVC runtimes
2017-07-27 21:53:53 +02:00
e6f9a5e2db
Merge viewer64
2017-07-27 21:07:14 +02: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
985730a52c
Merge.
2017-05-18 17:40:24 +02:00
4df25505e4
Merge
2017-05-18 17:10:31 +02:00
7005310541
Fix MAINT-7360 Investigate removal of MSVCR100.DLL and MSVCP100.DLL
2017-05-01 12:42:12 -07:00
69c8b02944
Merge Firestorm LGPL
2017-04-19 23:20:38 +02: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
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
e0d5b4d326
Switch to a glod version that is not depending on opengl fixed functions.
2017-03-10 11:45:38 +01:00
c6af775566
Linux; All the needed link libraries for GTK
2017-02-03 16:07:49 +01:00
Ansariel