summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Collapse)Author
2025-10-20Rework new convex decomp into a physicsextensions stub package and fix havok ↵Rye
and havok_tpv builds for darwin universal to utilize new vhacd stub (#4858)
2025-10-17Merge remote-tracking branch 'origin/main' into geenz/main-to-developJonathan "Geenz" Goodman
2025-10-16Fix erroneous check for __attribute__ definition introduced with APR 1.7.5Ansariel
With the update of APR to versoin 1.7.5., we have to deal with an erroneous check for the definition of __attribute__ added to the APR head file apr.h: The additional check for the definition of __has_attribute is nonsense as it is a C++ internal macro to check for the existance of certain attributes, however it has nothing to do with __attribute__ used in this context. Since __attribute__ is not defined in MSVC, the modified, erroneous check now causes said definition becoming missing, resulting in a huge amount of "this declaration may not have extern 'C' linkage" errors within in MSVC. This change utilizes CMake to patch the extracted APR header file, restoring the original version of the check.
2025-10-03Initial VHACD based llconvexdecompositionRye
2025-10-01Reenable havok llphysicsextensions on Darwin x86_64 with ↵Brad Linden
llphysicsextensions_stub used for aarch64
2025-09-11Follow up fixes for Apple Silicon (#4662)Rye
* Remove GLM sse flag from cmake that was moved to llpreprocessor.h * Further reduce performance loss of HDR and Sharpening on bandwith-constrained gpu by combining gamma correction into tonemap/sharpening shader passes * Update SSE2NEON to 1.8.0 to fix random render nans * Fix occasional startup crash from LLCachedControl being declared in global scope
2025-09-10Improvements found in reviewing mac_arm branch #4629Brad Linden
2025-09-05Fix macos build arch and deploy target due to cmake behavior changesRye
2025-09-05viewer-cef build fixesAndrey Kleshchev
2025-08-28Fixes for GHA buildRye
2025-08-28Fix up universal buildRye
2025-08-27Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemacRye
2025-08-27MacOS companion changes for dullahan 1.21 including package structure and ↵Rye
linkage fixes
2025-08-22Enable deprecation warnings and suppress a small handful that have no modern ↵Rye
replacements
2025-08-20Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemacRye
2025-08-05#4470 Adjustments and Mac build fixesAndrey Kleshchev
2025-08-05#4470 Plug in Discord SDK packageAndrey Kleshchev
2025-07-31Rich Presence support using Discord Social SDK (#4457)Erik Kundiman
* Rich Presence support using Discord Social SDK Download DiscordSocialSdk-1.4.9649.zip from https://discord.com/developers/applications/1394782217405862001/social-sdk/downloads Add -DUSE_DISCORD:BOOL=ON to your cmake line. The Discord app needs to be set to be a public client in the OAuth2 tab. All Discord-related code are contained within one file, llstartup.cpp, and other classes access it through some opaque layer, static functions, otherwise we'd get these "duplicate symbol" linking errors. * Move Discord-related code to llappviewer.cpp The doFrame is the one called over and over again, so running the Discord callbacks from there shouldn't have one extra function overhead, while running the Discord initialisation is only once so it's much more okay to have the extra function overhead there. * panel_preferences_privacy tabs Add tab and checkboxes for discord social SDK integration options to panel_preferences_privacy.xml * Shorten Discord-related local variable names * Connect to Discord now through privacy tab Now the access token is saved the way passwords are saved, but without a username, so we can have some persistence without having to implement an OAuth2 backend server cause we would have to store those tokens there anyway still, and it's just simpler to not go that way. Discord Social SDK doesn't have a helper for sending code to a custom server anyway, that we would have to have some asynchronous HTTP requestor ready. Show location check button gets enabled only when Discord integration is enabled, though it's not functioning yet. * Location for Discord Rich Presence Activity State I was going to use LLAgentUI::buildLocationString but there's no location format that shows only region and coords without having to have the parcel name empty, so I copied buildLocationString implementation in the case of LOCATION_FORMAT_NO_MATURITY but when the parcel name is empty. I had to make updateDiscordActivity check agent's ID and the existence of agent avatar pointer first before trying to set Activity Details or State, cause I like the "Show location" button be checkable not only after online when both the ID & pointer will have existed. I think this way is simpler than programmatically enabling the "Show location" button after the user is logged in. I put a trigger to Activity update somewhere after the user is logged in for now, not yet after a TP. The elapsed time gets reset whenever Activity is updated for now, but I'll try to make elapsed time extended instead. No Party for now, because I couldn't find a way to make a Party shown without showing its CurrentSize (I could still get away not showing its MaxSize by setting it to 0), so the State (location) is shown above the elapsed time, not on the right of it. I'll try to figure out to get some representative numbers for its CurrentSize & MaxSize next. Also no privacy on hiding the username for now, until the UI is ready. * Update Rich Presence location on region change I had to find a spot in source code where it doesn't cause a crash (it did in LLAgent::setRegion), but I'm not removing the one in llstartup.cpp because on login, the one in llviewermessage.cpp gets only the placeholder coords (10, 10, 10). * Show display name too on Discord Rich Presence Avatar name cache can be used right away upon login now after I moved the update call to the end of PRECACHE section in llstartup. * Show Discord Rich Presence Activity Party By setting CurrentSize to the number of people within chat radius, and MaxSize to the number of people within near range. * Call updateDiscordActivity too in Discord init so when the user enables the integration after being logged in, the init can show the name and location right away. * Discord Rich Presence: Hide name & connect to llappviewer.cpp Add option to show/hide avatar name in privacy panel & connect rich presense directly to llappviewer.cpp * Discord time elapsed not reset on region change Time elapses right after viewer launch even before login. Plus parameter name change in header to make it the same as in implementation. * Cache bool setting retrievals in updateDiscordActivity As suggested by Andrey Kleschev. getBOOL and getF32 are expensive, so using `static LLCachedControl<>` is the way to do it in llappviewer.cpp. * Check Discord creds existence before getting token as suggested by Andrey Kleshchev, anticipating external factors such as user moving settings from another PC. * Tracy visibility for looped Discord function calls As suggested by Andrey Kleshchev. They likely can get pricey so they need to be visible in the profiler. * Discord-related error handling/logging plus delay saving Discord credentials to only after the access token is successfully updated on Discord, and try to disconnect from Discord when the integration gets disabled regardless whether there are credentials to delete or not and whether there's an access token to revoke or not. * Use getAvatars already called for Discord Party numbers so we don't have to make any extra getAvatars calls just for this, as it's pricy in crowds, and we'll just be piggybacking `updateSpeakerList` and `updateNearbyList`. * Assemble Discord Activity Details only once by saving it to a static global string for reuse. * Remove updateDiscordActivity call in startup loop The State field (region & coords) is updated well enough without it now. * Rename handleDiscordSocial to toggleDiscordIntegration * Update Discord Activity only when integration is enabled No need to check setting for the status change callback one, because getting there would need to be connected to Discord first, which in turn needs the integration to be enabled first. --------- Co-authored-by: Secret Foxtail <remmy@megapahit.net>
2025-06-10macOS 26 build changes (#4239)Jonathan "Geenz" Goodman
* Fix for VLAs now emitting warnings on Xcode 26, and AGL being removed from the SDK. Note: there was no warning or notice provided for AGL's removal. * Whitespace.
2025-05-07Make builds support Python 3.13Andrey Kleshchev
2025-04-01#3712 CMakeFindFrameworks deprecationAndrey Kleshchev
2025-03-13Merge branch 'release/2025.03' into rye/forevermacJonathan "Geenz" Goodman
2025-03-12Try to parallelize xcode builds further and add more headers to PCH to ↵Rye
reduce build time
2025-02-11Fix deprecation warnings under C++20 on MSVCRye
2025-02-11Introduce build system and preprocessor support for ARM64Rye
2025-02-11Introduce SSE2NEON package for handling sse to neon intrinsic compatibilityRye
2025-02-11Update dependencies with support for apple siliconRye
2025-02-11Fix Tracy memory profiling overloads for aligned allocationsRye
Fix disabling renderdoc support Improve ll_aligned_alloc functions on darwin for 32 and 64byte aligned by utilizing posix_memalign
2025-02-11Update to use universal build flags and fix cmake deprecationsRye
2025-02-11Enable OpenAL by defaultRye
2025-02-11Update KDU to 8.4.1 and fix kdu tests, also fix llimage_libtest utilityRye
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-12Replace glh_linear usage with GLM (#2554)Rye Mutt
2024-09-04Introduce OpenXR SDK prebuilt package and cmake setup (#2503)Rye Cogtail
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-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-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-02Update to libhunspell 1.7.2-r1 (#2175)Rye Mutt
2024-08-02Remove dead pcre library dependency (#2177)Rye Mutt