Commit Graph

132 Commits (95e44923920fbd57eaeec50ae696aee80405b457)

Author SHA1 Message Date
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
Nicky 16aa95b0c6 Windows; Make autobuild build and clean work again. 2017-02-05 21:05:04 +01:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Ansariel 05c6c72b15 Add build switch to generate time-limited test builds. Use via --testbuild <days> 2016-11-30 15:41:15 +01:00
Nicky dfd3d3f2dc Remove HAVE_QUICKTIME_3P cmake option, Quicktime on Windows is finally dead. 2016-10-14 15:15:01 +02:00
Ansariel a818913ab3 Add support for AVX2 optimizations (available for Windows only so far) 2016-03-29 15:57:02 +02:00
Nicky 5c73246c10 Only use indra/newview/VIEWER_VERSION.txt 2016-02-24 22:50:08 +01:00
Ansariel ce470a6427 Just for consistency since everything else is in caps... 2016-01-28 19:14:23 +01:00
Nicky 8f22fbee51 Add --quicktime switch to build with media_plugin_quicktime and enable it for ReleaseFS (Windows only). 2016-01-26 16:38:35 +01:00
Nicky 4ffd74e025 Remove leapmotion, it's outdated and unsupported. 2016-01-06 13:59:08 +01:00
Nicky 245d1ee3df Win64: Split the clean step into a few smaller steps. Otherwise NTFS can be pretty slow and leading to timeouts during automated builds. 2015-07-20 09:33:29 +02:00
Nicky 33f1513c45 Add option to use ninja instead of make. 2015-06-20 20:09:45 +02:00
Nicky 586798c834 Cache type for NDTARGET_ARCH 2015-05-27 12:07:29 +02:00
Nicky 996de24dbc Clean for Win32/64 was not deleteing the right directory. 2015-05-11 13:56:06 +02:00
Nicky fc51c75740 After configure: Set active configuration in VS2013 solution. 2015-05-08 12:55:51 +02:00
Nicky 3bfc9aa8d9 Configure for VS2013. 2015-05-05 14:14:58 +02:00
Nicky 22e028c9ae Merge with lgpl tip. 2014-06-14 17:58:37 +02:00
Tonya Souther f012adc883 Fix --clean error on Win64 and clean the right thing on Linux 64. 2014-06-02 07:12:54 -05:00
Nicky a0dbdc3a96 Pass through of 64 bit switch to cmake. 2014-05-26 16:54:53 +02:00
Techwolf Lupindo 5285d311db More linux 64-bit build fixes. Add 64-bit parts to configure_firestorm.sh 2014-02-22 09:29:18 -05:00
Tonya Souther b28c82a76d Enable --avx switch on Linux. Requires at least GCC 4.6.0. 2014-01-27 03:35:23 -06:00
Cinders 1f3cf9bce2 Initial Leap Motion controller support, includes llleapmotioncontoller.* test code from Simon Linden
To build with Leap Motion support build with —leapmotion (Very unstable!)
2013-11-27 20:09:34 -07:00
Nicky bd28032b66 Proper clean for Windows x64. 2013-10-22 23:06:07 +02:00
Nicky 565f941717 Merge with FS tip. 2013-10-17 00:37:15 +02:00
Cinders 7320729d7f Handle darwin compiler optimizations where they belong, in cmake not the bash script 2013-10-16 15:32:56 -06:00
Nicky 16d455e0cf Merge. 2013-08-15 22:22:28 +02:00
Cinders 96a439b24c Oops, forgot to check for no-package in the arguments 2013-08-12 14:53:31 -06:00
Cinders 8c296032f5 Add --no-package flag to configure_firestorm.sh 2013-08-12 09:36:38 -06:00
Cinders 22fb8841be Snow leopard should be the exception, not the standard for building 2013-08-09 12:03:48 -06:00
Nicky b7679961e1 - Add dummy WiX & SLPlugin to autobuild.xml. Those are needed for 64 bit Windows (Precompiled 32 bit SLPlugin, WiX to create installer).
- Allow 64 bit build to package.
- Create proper packagge targets for 64 bit Windows.
2013-08-04 20:00:19 +02:00
Nicky 0addf213ed Merge with FS tip. First pass. 2013-08-02 00:40:48 +02:00
Nicky 1077938a72 Add 64 bit Windows support to our configure script. 2013-08-01 23:42:43 +02:00
Nicky 0ccd7b37f7 Only use -DUNATTENDED=ON when running on windows. cmake complains about it being not used on all other platforms. 2013-03-25 02:54:55 +01:00
Cinders 44cd20cb31 Add a --no-opensim flag to configure_firestorm.sh for good measure. 2013-07-10 21:28:17 -06:00
Cinders b04e370472 Trivial whitespace change in configure_firestorm.sh (make stuff line up) 2013-07-10 13:50:19 -06:00
Ansariel ea4e1eda82 Fix typo in configure_firestorm.sh 2013-07-10 21:11:39 +02:00
Cinders f426fba9f2 Support passing --opensim and --avx to build 2013-07-10 12:31:24 -06:00
Ansariel f81d31b0ca Fix build script to properly pull FmodEx 2013-07-10 11:58:46 +02:00
Tonya Souther c797878e42 Fix --chan argument to build command. 2013-07-10 04:08:31 -05:00
Cinders 4ce5358f89 Clean up build scripts post merge - Pass #1 2013-07-09 20:07:58 -06:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nicky 69acbfefd9 Rollback of 7efa369bc006 xcodebuild does not return a proper return value to trap build error this way. 2013-03-03 21:03:05 +01:00
Nicky dc30290267 Make configure/build always return a proper error code (1) on failure. 2013-03-02 18:50:30 +01:00
Tonya Souther ee7bf28a04 Make --jobs option work on OS X with Xcode 4. 2013-01-21 15:35:11 -06:00
ziree 5c3130fa40 Added compiler swith for Linux to override autodetected number of compile jobs - Followup - typo fix 2013-01-21 11:50:00 +01:00
ziree f3abe0e35e Added compiler swith for Linux to override autodetected number of compile jobs. Prevents issues on processors that report a lot of cores but only have hyperthreading, also can save memory while compiling. 2013-01-21 11:34:40 +01:00
Tonya Souther a6df1b36c2 FIRE-8231: Fix compiling on Mountain Lion (OS X 10.8). Found by Shin Wasp. 2012-11-16 14:25:21 -06:00
Arrehn f6898ac3e6 Clean build robustness and line formatting fixes 2012-09-15 11:51:08 -04:00
ZiRee 4b4e14ab27 Only unfocus the main chat bar if deselect chat is enabled. 2012-02-04 23:19:51 +01:00
Tonya Souther 8f8922b1d6 OS X Lion build fix: remove GCC_VERSION=4.2 only if building on Lion. 2011-11-08 21:22:47 -06:00
Arrehn 8092fcf434 FIRE-3718, more robust hostname lookup, spelling fixes in configure_Firestorm.py. Thanks Miguael Liamano 2011-10-29 01:12:59 -04:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn 7fb04b35f3 Take2, make sure we clean up skin & resource files when packaging. 2011-10-22 10:23:16 -04:00
Arrehn d731bb3744 Backing package-clean work out for now. 2011-10-21 13:03:04 -04:00
Arrehn 650d3ba62d Updates to last commit, more robust across platforms 2011-10-21 12:58:23 -04:00
Arrehn 68d22220fb Clear previously packaged resource files prior to each 'package' build. 2011-10-21 11:17:00 -04:00
Arrehn fc3eaffc0d Always replace old build logs, even on quick rebuilds 2011-10-09 20:46:00 -04:00
Arrehn a4d4b6fb6a Fix bug in configure_firestorm.sh --clean 2011-08-29 22:38:48 -04:00
Arrehn c802ea2279 ReleaseFS autobuild target improvements. No package by default, better --btype parsing 2011-08-27 23:25:13 -04:00
Arrehn 5f80dbef9e FS Autobuild improvements: support for RelWithDebInfoFS_open, LL-style config options, more documentation 2011-08-19 20:48:34 -04:00
Arrehn ca285b12f4 FIRE-2555: Fix private channel on windows builds 2011-08-17 11:49:35 -04:00
Arrehn 39c1e03382 Recreate log directories after clean targets 2011-08-14 16:53:55 -04:00
Arrehn e23b163acf MacOSX Lion build compatibility & adjustments, adapted from Mimika Oh 2011-08-14 12:08:44 -04:00
Wolfspirit 2338d9ce8f Set default StartupProject, Workingdir and Configuration for Windows builds
This sets this three values to match the "autobuild build" command.
2011-08-13 01:04:57 +02:00
Arrehn 98cbc601d8 configure script typo, correction from Satomi Ahn 2011-08-07 15:17:14 -04:00
Arrehn 6350754357 Remove unnecessary build flag 2011-08-06 01:30:39 -07:00
Arrehn 2676fe01d3 Adding in "ReleaseFS_open' autobuild target for non-kdu builds. Documentation & cleaning fixes. 2011-08-06 08:36:02 -04:00
Arrehn 61cb88c510 Mini-merge up to FS-tip. Note: Reverted OSX Lion build sdk changes, due to failure to produce a viable build on snowleopard. 2011-08-05 11:35:59 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00