summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
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-05-09SL-17376 Fix viewer failing due to missing vcruntime140_1Andrey Kleshchev
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-02Merged in nd_cleanup_v2 (pull request #891)Nicky Dasmijn
Remove all boost, fix calling functions on nullptrs, initialize vars Approved-by: Maxim Nikolenko Approved-by: Nat Linden Approved-by: Andrey Lihatskiy
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # 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-01Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into ↵Andrey Lihatskiy
DRTVWR-543-maint # Conflicts: # autobuild.xml
2022-02-28There seems to be a reluctance to kill boost for VS2005(!), lets get ridNicky
of it.
2022-02-28Merge remote-tracking branch 'll/master'Nicky
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-02-18Brinng back indra/cmake/LLAppearanceUtility.cmake as well.Nicky
2022-02-11Spring cleaning, remove all traces of old 32 bit darwin/linux packages.Nicky
2022-01-14DRTVWR-550 unbreak debug build linking on DARWIN. -d suffux libs havent ↵Brad Kittenbrink
existed for a while
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-16Merge branch 'SL-15742' into DRTVWR-527-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-10SL-15742: Convert build scripts to Python 3Bennett Goble
This changeset makes it possible to build the Second Life viewer using Python 3. It is designed to be used with an equivalent Autobuild branch so that a developer can compile without needing Python 2 on their machine. Breaking change: Python 2 support ending Rather than supporting two versions of Python, including one that was discontinued at the beginning of the year, this branch focuses on pouring future effort into Python 3 only. As a result, scripts do not need to be backwards compatible. This means that build environments, be they on personal computers and on build agents, need to have a compatible interpreter. Notes - SLVersionChecker will still use Python 2 on macOS - Fixed the message template url used by template_verifier.py
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)Dave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-12(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)Dave Houlton
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-10-22Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h
2021-10-19SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument ↵Dave Parks
LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-13Merge branch 'master' v6.4.24 into DRTVWR-546Dave Houlton
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-10-14Merge branch 'master' into DRTVWR-545-maint-mixAndrey Lihatskiy
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp
2021-09-22SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha)Dave Parks
2021-09-09SL-14541 MacOS build fixAndrey Kleshchev
2021-09-08SL-15211 SL-14541 Update OpenSSL libraryAndrey Kleshchev
Moving a copy of OpenSSL 1.1.1 to D543 from D520 to have less conflicts with zlib-ng integration later
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-09-03SL-15709: Windows: Include Tracy source directly; don't use a libraryPtolemy
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-08-31SL-15709: Fix LLCommon not setting Tracy include directory and not linking ↵Ptolemy
to tracy.lib
2021-08-31SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy ↵Ptolemy
not enabled
2021-08-27Merge branch 'c++17' into DRTVWR-522-maintAndrey Lihatskiy
2021-08-26SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast ↵Ptolemy
Timers; also print Tracy include directory
2021-08-26SL-15709: Default Tracy to offPtolemy
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 07:24:37 +0000