summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2024-09-23Merge remote branch 'develop' into release/luau-scripting for Maint BNat Goodspeed
2024-09-23Turn off tracy on linux to unbreak the build.Brad Linden
2024-09-23Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # indra/newview/llfeaturemanager.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvoicewebrtc.cpp
2024-09-23Merge remote branch 'develop'into release/luau-scriptingNat Goodspeed
2024-09-17#2590 Fix for horrible FPS on Intel Mac (#2591)Dave Parks
* Work around for GHA mac runners not playing nice with Tracy * Delay VBO deletion for a few frames * Enable multithreaded GL driver and multithreaded media textures on Apple silicon
2024-09-17Mac pass (#2587)Dave Parks
2024-09-13Clean up Windows build (#2562)Ansariel Hiller
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake * Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake * Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default * Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h * Clean up includes of Windows API headers * Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
2024-09-12Merge branch 'develop' into release/luau-scriptingNat Goodspeed
2024-09-12Replace glh_linear usage with GLM (#2554)Rye Mutt
2024-09-09Merge branch 'develop' into release/luau-scriptingNat Goodspeed
2024-09-05Merge branch 'develop' into release/luau-scriptingNat Goodspeed
2024-09-04Introduce OpenXR SDK prebuilt package and cmake setup (#2503)Rye Cogtail
2024-08-28Ditch trailing spaces.Nat Goodspeed
2024-08-28Merge branch 'main' into release/luau-scripting.Nat Goodspeed
2024-08-21Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # indra/newview/llvoicewebrtc.cpp
2024-08-20#2354 Enable Tracy on test builds (#2357)Dave Parks
* #2354 Enable Tracy on test builds * Only enable Tracy by default on windows
2024-08-20Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # autobuild.xml # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FreeType.cmake # indra/newview/llappviewer.cpp # indra/newview/skins/default/xui/en/floater_fast_timers.xml # indra/newview/viewer_manifest.py # indra/test/test.cpp
2024-08-16Remove pointless CMake status message (#2322)Ansariel Hiller
2024-08-14Enable /permissive- on MSVC for better standards conformance (#2251)Rye Mutt
* Enable /permissive- on MSVC for better C++ conformance and fix related errors * Clean up left over warning suppressions from old library or msvc versions
2024-08-14Update indra/cmake/Tracy.cmake Andrey Lihatskiy
to stop pre-commit from complaining
2024-08-13Update tracy integration to 0.11 and rework client library to be ↵Rye Mutt
configurable at build time Also copy tracy profiler client next to windows binary when enabled
2024-08-12Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf ↵Rye Mutt
packages (#2250) Rebuild expat, apr, meshoptimizer, ogg_vorbis, libjpeg-turbo for symbol fixes
2024-08-09Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into developBrad Linden
# Conflicts: # .github/workflows/build.yaml # indra/llui/llscrolllistctrl.cpp
2024-08-09Merge remote-tracking branch 'origin/release/webrtc-voice' into ↵Brad Linden
release/2024.06-atlasaurus # Conflicts: # .github/workflows/build.yaml # indra/newview/CMakeLists.txt # indra/newview/llspeakers.cpp # indra/newview/llvoicechannel.cpp # indra/newview/llvoicechannel.h # indra/newview/llvoiceclient.cpp # indra/newview/llvoiceclient.h # indra/newview/llvoicewebrtc.cpp
2024-08-08CR fixesRoxie Linden
2024-08-08Update libexpat to 2.6.2 and libapr 1.7.4 (#2214)Rye Mutt
2024-08-06Force ReleaseOS builds on LinuxAndrey Lihatskiy
2024-08-06Merge branch 'develop' into marchcat/b-syncAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # autobuild.xml # indra/cmake/Audio.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/llxml/llxmltree.cpp # indra/newview/viewer_manifest.py
2024-08-06Ignore VmallocTotal as it's fixed, huge Number. (#2200)Nicky Dasmijn
Not ignoring it will cause a lot of log spam due to conversion/parse errors.
2024-08-05Build mac symbols for multiple binaries/dynamic libraries and upload them ↵Roxie Linden
all to bugsplat
2024-08-05Update ogg_vorbis to 1.3.5-1.3.7 (#2186)Rye Mutt
2024-08-03Merge remote-tracking branch 'll/marchcat/b-develop' into ↵Nicky
feature/warning_cleansweep
2024-08-03Remove -wno-dangling-pointer, compiling with GCC 13.3, 12, 11 and clang did ↵Nicky
not yield such a warning. Furthermore this warning should not just be disabled but rather dealt with when it comes up
2024-08-02Update to libhunspell 1.7.2-r1 (#2175)Rye Mutt
2024-08-02Remove dead pcre library dependency (#2177)Rye Mutt
2024-08-02Update from jpeglib to libjpeg-turbo 3.0.3 (#2161, #2173)Rye Mutt
2024-07-29Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
2024-07-29Replace liburiparser with boost::urlRye Mutt
2024-07-29Fix lltest failure by outputting to the sharedlibs dir like other tests on ↵Rye Mutt
windows
2024-07-24Merge branch 'develop' into marchcat/b-developAndrey Lihatskiy
2024-07-21Add newer MSVC redist libs to copy action (#2075)Rye Mutt
2024-07-19Enable SSE2 instruction support in glm for optimized codegen (#2066)Rye Mutt
2024-07-18Merge branch 'release/maint-b' into marchcat/b-developAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/JsonCpp.cmake # indra/llimage/llimageworker.cpp # indra/llmessage/CMakeLists.txt # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodelloader.cpp # indra/llprimitive/llmodelloader.h # indra/llwindow/llkeyboard.cpp # indra/llwindow/llkeyboard.h # indra/llwindow/llkeyboardheadless.cpp # indra/llwindow/llkeyboardheadless.h # indra/llwindow/llkeyboardsdl.cpp # indra/llwindow/llkeyboardsdl.h # indra/llwindow/llwindowsdl.cpp # indra/llwindow/llwindowsdl.h # indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llconversationloglist.cpp # indra/newview/lldirpicker.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llfloaterpreferencesgraphicsadvanced.cpp # indra/newview/llmodelpreview.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelface.cpp # indra/newview/llviewerobject.h # indra/newview/llxmlrpctransaction.cpp # indra/newview/viewer_manifest.py
2024-07-01#1111 Remove xmlrpc-epiAlexander Gavriliuk
2024-06-18Fix whitespace for pre-commit hooksBrad Linden
2024-06-17Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-developBrad Linden
2024-06-14Fix for warnings/errors after Visual Studio update (#1775)Dave Parks
2024-06-14Merge branch 'release/maint-b' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl # indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl # indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl # indra/newview/llfilepicker.cpp
2024-06-14Revert "Replace LL_X11 and LL_FLTK to LL_LINUX"AiraYumi
2024-06-13Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 22:48:58 +0000