Commit Graph

1584 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Nicky Dasmijn fcd54589ca BugSplat is not available for OSX or Linux right now. 2020-01-04 23:24:01 +01:00
Nicky f238377c80 Bake git rev. hash into the viewer. 2019-12-29 23:27:02 +01:00
Nicky c1152886f7 Prepare for git:
- When configured from a git directory (crudely detected by testring for .git/ existance) use AUTOBUILD_BUILD_ID for the revision.
- Oterwise use the locale mercurial change number (as before).
2019-12-14 10:53:00 +01:00
Ansariel 797fa6718b Merge 494-maint-wassail 2019-11-28 17:09:26 +01:00
Nat Goodspeed b6befdf713 DRTVWR-494: Merge copy-paste-friendly test output to tip 2019-11-23 22:22:47 -05:00
Nat Goodspeed 4cb6e9ee08 DRTVWR-494: Show copy-paste-friendly env vars and test command.
Moderately often I want to copy the (long) integration test program path from
build output and rerun the test program by hand. But typically we need
environment variables set as well so it can find its dynamic libraries. This
has resulted in my copying parts of several lines of build output, then
pasting to a command prompt, then hand-tweaking the pasted text so it makes
sense as a command.

Streamline run_build_test.py output so less hand-tweaking is needed.
2019-11-23 22:16:39 -05:00
AndreyL ProductEngine d0d2a6e8a4 Merged in lindenlab/viewer-release 2019-10-29 20:02:11 +02:00
Ansariel 2e98ed3b94 Merge Firestorm LGPL 2019-10-29 18:29:48 +01:00
Ansariel 24231e7a71 Merge voice-56 2019-10-18 18:13:32 +02:00
Oz Linden 80236bb657 merge 6.3.2-release 2019-10-16 09:07:50 -04:00
Ansariel 146d527104 Merge viewer-neko 2019-10-09 22:05:52 +02:00
AndreyL ProductEngine fe490d52b4 Merged in lindenlab/viewer-xcode11 2019-10-09 19:28:30 +03:00
Tonya Souther 4ad358fe13 Provide null code signing identity for Xcode 11. Thanks to Nicky Perrian. 2019-09-30 14:43:42 -05:00
Nat Goodspeed c0b13466f1 DRTVWR-476: Add Stack Overflow link for Brad's Xcode 11 signing fix. 2019-09-25 16:46:49 -04:00
Brad Kittenbrink 5d671ff210 Disabled broken automatic code signing for local development when using Xcode 11 2019-09-25 12:53:38 -07:00
Liny d428d17aaa After feedback from discord, add the client key into Variables.cmake.
Note to any other third party client, please obtain your own key for your client so you can customize the rich presence features.
2019-09-25 01:01:25 -07:00
Oz Linden b74f698caa handle slvoice executable separately from the vivox libraries, and update mac slvoice package 2019-09-06 11:51:36 -04:00
Ansariel 0ddac19941 Merge Firestorm LGPL 2019-09-10 18:35:34 +02:00
Ansariel 242fbdbbbe Fix CMake warning 2019-09-10 17:42:56 +02:00
Nicky 767f382a70 Corrected library names. 2019-09-10 17:13:22 +02:00
Nicky fd53956f30 Completly build without Discord if no API Key is given. 2019-09-10 16:55:38 +02:00
Liny 72ed55ca02 Fix cmake syntax differences between it and c 2019-09-10 04:44:04 -07:00
Liny 1c8be4e323 Discord rich presence support 2019-09-10 04:24:02 -07:00
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
Oz Linden 4cbef35f50 update Vivox for VOICE-56 2019-07-16 18:17:23 -04:00
Tonya Souther e7d80f2ca5 [OPEN-345] Get rid of enigmatic build message. 2019-06-16 11:59:01 -05:00
AndreyL ProductEngine 0574d03bfa OPEN-345 Fixed enigmatic messages during build 2019-06-17 19:46:20 +03:00
Ansariel 5e11d2725d Merge Firestorm LGPL 2019-06-13 18:29:33 +02:00
Ansariel dd05edde98 FMOD Studio 2.00.01 for Windows 2019-06-08 15:00:23 +02:00
Ansariel b0baac1232 Keep Linux-specific stuff Linux-specific 2019-05-31 20:07:37 +02:00
Tonya Souther aa87f75ece Silence Cmake 3.11+ OpenGl warning. 2019-05-31 06:27:10 -05:00
Ansariel c328e340d2 Merge Firestorm LGPL 2019-05-21 19:19:06 +02:00
Ansariel 3adc5c2b50 Merge viewer-neko 2019-03-26 19:15:36 +01:00
Ansariel b95fcdf3b3 Some fixes for the build setup:
* Fix wrong lookup path for nghttp2.lib on Windows
* Fix missing details in output of configure_firestorm.sh script
* Fix circular link dependency in LLWindow, causing CMake CMP0038 warning;
  viewer now builds with CMake 3.13.4 upwards (64bit CMake as well)
2019-03-08 00:03:30 +01:00
andreykproductengine 50f0843e76 Get rid of vstool 2019-03-06 16:31:11 +02:00
andreykproductengine ba24af923c Fix for local studio builds 2019-03-04 14:59:33 +02:00
Ansariel 23d837c1d9 Merge Firestorm LGPL 2019-03-01 16:38:35 +01:00
AndreyL ProductEngine 27e197459d Merge 2019-03-01 02:28:15 +02:00
Nicky f1d03d4f01 FIRE-23299; Option to use jemalloc (Linux x64). 2019-02-28 15:58:43 +01:00
Nat Goodspeed 1a1465dab9 Re-enable warnings-as-errors (-Werror) in Mac builds. 2019-01-16 14:23:45 -05:00
Ansariel 8b6392c0aa Merge viewer-bugsplat 2018-12-16 13:04:08 +01:00
Nat Goodspeed 601cbe1f60 SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need. 2018-12-08 12:18:46 -05:00
Ansariel 43c858c505 Merge Firestorm LGPL 2018-10-27 00:52:12 +02:00
Ansariel ee34ea1f4b Merge viewer-bugsplat 2018-10-27 00:50:58 +02:00
Nat Goodspeed 036c52fcdf Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon 2018-10-17 10:31:59 -04:00
Ansariel 12d0320c5e FIRE-23063: Replace deprecated exception handling syntax that isn't supported in Python 3 anymore; Path by Lance Corrimal 2018-10-12 11:11:55 +02:00
Nat Goodspeed 8761e87ac5 DRTVWR-474: Remove Python autobuild packages and references to them.
We expect the viewer-manager package to be self-contained: we expect it to
bring with it any Python packages it requires. We no longer force developers
to wrap third-party Python packages as autobuild packages.
2018-09-24 14:02:23 -04:00
Ansariel 606adaffe7 Merge viewer-bugsplat 2018-09-12 18:09:43 +02:00
Oz Linden 9fd463bd94 remove only-partially-successful attempt to put teamcity blocks around targets 2018-09-07 09:13:57 -04:00
Oz Linden fac16e53f6 refine TeamCity blocks to avoid double nesting, and disable
for Windows
2018-09-07 08:30:21 -04:00