summaryrefslogtreecommitdiff
path: root/indra/cmake/CMakeLists.txt
AgeCommit message (Collapse)Author
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-08-28Merge branch 'contribution/emoji'Kitty Barnett
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-03-01Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into ↵Andrey Lihatskiy
DRTVWR-543-maint # Conflicts: # autobuild.xml
2022-02-11Spring cleaning, remove all traces of old 32 bit darwin/linux packages.Nicky
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-08SL-14541 removed breakpad, win_crash_loggerAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h # indra/win_crash_logger/llcrashloggerwindows.cpp Cherry picked from DRTVWR-520
2021-07-08DRTVWR-542 WIP #2Andrey Kleshchev
2021-07-07SL-15522 Initial addition of meshoptimizerAndrey Kleshchev
2021-03-17SL-14541 removed breakpad, win_crash_logger, updated zlibAndrey Kleshchev
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-06-02DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.Nat Goodspeed
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
and the 8.1 SDK) DirectX is included in the SDK and does not need any special detection logic.
2020-02-04SL-12654 Remove support for building with fmod exAndrey Kleshchev
2020-01-31Merged in SL-11445 Upgrade Fmodex to Fmod StudioAndrey Kleshchev
2019-11-07Fallback fonts can have first crack at adding an unknown character + set ↵Kitty Barnett
Twemoji as the viewer's fallback for all emoji blocks
2018-05-17SL-821: Move Windows BugSplat engagement from llcommon to newview.Nat Goodspeed
Use WSTRINGIZE(), LL_TO_WSTRING(), wstringize() to produce required wide strings. Use a lambda for callback that sends log file; use LLDir, if set, to find the log file. Introduce BUGSPLAT CMake variable to allow suppressing BugSplat. Make BUGSPLAT CMake variable set LL_BUGSPLAT for C++ compilations. Set viewer version macros on llappviewerwin32.cpp, llappviewerlinux.cpp and llappdelegate-objc.mm -- because BugSplat needs the viewer version data, and because the macOS BugSplat hook is engaged in an Objective-C++ function we override in the app delegate.
2017-09-29MAINT-2081: Remove ancient snapshot of CMake GetPrerequisites.Nat Goodspeed
Mani captured that snapshot back when CMake version 2.8 was newer than what was running on our build systems. Now we have to assume that the bundled GetPrerequisites.cmake is better than our old snapshot. Use the bunded one.
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-05-26Put back QuickTime plugin code for OS X only (untested - moving code to OS X ↵callum_linden
dev)
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-19Automated merge with tip of viewer-release to pick up 4.0.5callum_linden
2016-05-06Moving to a private repocallum_linden
2016-04-21DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewercallum_linden
2016-04-21DRTVWR-418 remove references to some misc files I missedcallum_linden
2016-04-21DRTVWR-418 remove references (and files) for QuickTimecallum_linden
2016-04-19Remove references to quicktime from the plain old viewer-release buildcallum_linden
2016-04-04merge with 4.0.3-releaseOz Linden
2016-02-07merge changes for OPEN-292Oz Linden
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-12-18MergeRider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-02MAINT-5687: Remove old webkit from the make files and the repo. Ensure that ↵Rider Linden
it is no longer meaningfully referenced.
2015-09-23Remove ares dependency from build.Rider Linden
2015-08-19Found another ref that had escaped me!Rider Linden
2015-08-19I must be losing my mind...Rider Linden
2015-08-19Try disabling LLAppearanceUtility.cmake just for the moment.Rider Linden
2015-03-24Add new media plugin (currently renders squares as example) in preparation ↵callum_linden
for new CEF code
2015-03-24Refer to new QuickTime third party package with fixes for VS2013 & re-add ↵callum_linden
QuickTime media plugin
2015-02-26Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-02-08OPEN-292 - Remove lscript from project,Cinder
Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 15:52:34 +0000