Commit Graph

118 Commits (69f4ef7cd4e44c2c7d8a1a19ea43e612fc04bcb8)

Author SHA1 Message Date
Ansariel 02d9ba16c8 Let's add this back, too 2022-09-25 13:25:15 +02:00
Ansariel d90263f4c4 No idea where these changes came from, but they break local Windows builds 100% 2022-09-25 13:19:48 +02:00
Beq 6569f18332 Apply GHA fixes from Nicky's branch that I managed to miss. 2022-09-23 11:23:19 +01:00
Beq 9e19e6712b updates for GHA to get windows to work.
also requires python hackery pushed as separate commit pending a better solution.
2022-09-17 22:26:27 +01:00
Ansariel 718f9fdf7a Set correct root project name and build type in CMake and don't use VSTool by default 2022-08-13 17:09:24 +02:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
Nicky 1168b43580 Windows; use VS_DEBUGGER_WORKING_DIRECTORY to get rid of vstool if
possible. Enable by passing --no-vstool to configure
2022-02-26 13:55:14 +01:00
Ansariel 0aa59b2bee Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-02-22 13:40:40 +01:00
Nicky 97a273e241 Make sure all bugsplat crashes land in one database per channel. 2022-02-18 22:31:31 +01:00
Ansariel f0352ff093 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-02-16 09:49:24 +01:00
Nicky c7f39b5043 Linux; bring back breakpad. No upload to bugsplat implemented yet. 2022-02-09 23:04:31 +01:00
Nicky b8bcbd9af5 For the moment nnly accept --crashreporting when building a windows viewer. Bugsplat on OSX yields in an unusable viewer (FIRE-31306) and Linux is without crash reporting. 2022-02-08 17:43:03 +01:00
Nicky ae2644535b Linux; Do not build with OpenAL unless really requested. 2022-02-08 09:55:35 +01:00
Ansariel 61a842ee43 Debug builds are gone 2022-01-26 19:02:00 +01:00
Ansariel 08fe29a658 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-01-22 11:46:16 +01:00
Nicky 55ce47676b Add option to enable compiler cache (if found). 2022-01-17 18:25:04 +01:00
Nicky 5929d4780d Enable ninja build generator for all platforms 2022-01-17 16:54:33 +01:00
Beq 0911cae538 Initial merge of DRTVWR-541 into FS
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
Nicky ea32c0fba2 Strip off _x64 when converting channel > bugsplat db. We do not want x64 and x86 crashes in different databases. 2021-09-26 12:25:45 -04:00
Nicky 5002c9caf4 Make the configure script smarter by automatically setting up bugsplat in case crashreporting is desire (and a channel is set). 2021-07-15 22:38:40 +02:00
Beq d640123781 Incorporate Tracy profiler as 3p 2021-03-21 14:29:03 +00:00
Ansariel 57aabe08e3 Try bundling the VC redistributable runtime DLLs of the Visual Studio version first - improved version based on work by Chorazin Allen 2020-11-13 08:59:52 +01:00
Ansariel d80df3cdb7 Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
Nicky Dasmijn f116ea4cb7 Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
Tonya Souther b44c133c49 Make the --clean option on autobuild actually work again on Linux. 2020-07-15 09:47:07 -05:00
Nicky e3781c3347 Rudimentary VSCode support. 2020-06-13 20:25:01 +02:00
Nicky Dasmijn 7c7e3ae8ba Merge remote-tracking branch 'fs/master' into fs-eep-vs2017-d476 2020-06-03 19:28:05 +02:00
Nicky Dasmijn a4aff377e6 Merge branch 'master' into fs-vs2017 2020-04-29 20:02:19 +02:00
Ansariel db30295c98 Remove FMOD Ex and first round sync with upcoming changes from upstream 2020-04-08 22:29:21 +02:00
Nicky 0ce85ef3b8 Linux always builds (and always had been built) with OpenAL, make sure it is always enabled. 2020-02-15 10:22:19 +01:00
Ansariel f6012f78f9 FIRE-29311: Fix building with OpenAL on Windows, based on a patch by Testicular Slingshot 2020-02-09 19:36:10 +01:00
Nicky 9ef897a178 exclude all tags/branches to always just get a git hash rather than an amalgamation of tag/branch and hash (which though is valid too). 2020-02-01 14:44:52 +01:00
Nicky f238377c80 Bake git rev. hash into the viewer. 2019-12-29 23:27:02 +01:00
Nicky Dasmijn 7f9bce5ada Merge branch 'master' into fs-vs2017 2019-12-21 01:52:19 +01:00
Ansariel d12c9550e9 Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo) 2019-12-14 17:02:34 +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 b75b1eb789 Merge viewer-vs2017 2019-03-31 01:37:56 +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
Ansariel 7ed3c52d63 Fix indention 2019-03-02 13:14:21 +01:00
Nicky ff72f76489 Linux uses a slightly different directory to save breakpad symbols. 2019-03-01 20:59:10 +01:00
Ansariel 051811ed62 Fix copy&paste error in configure_firestorm.sh script 2018-10-04 02:13:23 +02:00
Ansariel db8e20101f Create convenience option for singlegrid in configure_firestorm.sh script 2018-10-04 02:04:42 +02:00
Ansariel 4c25c8ef9f Improve --testbuild command description 2018-09-12 18:13:28 +02:00
Ansariel b075b3a435 Adjust configure_firestorm.sh to pass VIEWER_SYMBOL_FILE into CMake plus additional fixes on the way:
* Reduce platform parameters to darwin, windows, linux (win64 & linux64 aren't used at all, win32 renamed to windows)
* Introduce new parameter --crashreporting to enable crash reporting (Do NOT! use -DRELEASE_CRASH_REPORTING:BOOL=ON anymore - it won't work with new way symbols are generated!)
* Using --build on Windows now won't gloriously fail anymore - Did some ever even tried this before???
* Sync MSBuild command line options with options specified in autobuild.xml
2018-08-31 16:58:30 +02:00
Ansariel 372d63747e Remove Quicktime leftovers in configuration script 2018-01-31 16:52:46 +01:00
Tonya Souther 45e9b40be9 More OS X build fixes. 2018-01-27 08:40:18 -06:00
Ansariel 20bffceffd Merge Firestorm LGPL 2018-01-09 14:11:28 +01:00
Ansariel 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
Ansariel db266722b4 Clean up Firestorm configuration script 2017-07-29 12:56:12 +02:00
Nicky 58bfdbefc8 Detect missing AUTOBUILD_VARIABLES_FILE environment variable and early fail configure (or later it will fail more cryptic due to missing LL_BUILD variable). 2017-06-19 02:12:57 +02:00