summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2024-08-19Merge branch 'webrtc-voice' into 2024.06-atlasaurusErik Kundiman
2024-08-19Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-08-19Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-18openSUSE Tumbleweed supportErik Kundiman
Its own CPACK_RPM_PACKAGE_REQUIRES will catch up soon.
2024-08-14Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-12Automatic XMLRPC-EPI Mac download, build & installErik Kundiman
When linking to the static archive on arm64, it would fail with an error of undefined iconv symbols. When linking to the dynamic library, the path was to the dynamic library was still assumed to still be in /usr/local/lib, so specifically for the executable target, this needs to be changed (temporarily) to the one in the prebuilt directory first, to later be changed again by fixup_bundle to the bundled one in Frameworks.
2024-08-12Automatic OpenJPEG download, configure & installErik Kundiman
2024-08-11CPACK_DEBIAN_PACKAGE_DEPENDS are in CMakeLists nowErik Kundiman
and can be differentiated across different distros, even though there are only stable/LTS Debian and Ubuntu for now.
2024-08-11Rearrange CPack settings & contributors generationErik Kundiman
where they belong in newview/CMakeLists.txt.
2024-08-10Make sure APP_SHARE_DIR is valued in llfilesystemErik Kundiman
otherwise the app would crash on GNU/Linux or BSD for missing the share directory prefix, unless cmake is run twice like before just so APP_SHARE_DIR is picked up but we don't want to have to run it twice.
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-09Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman
2024-08-09Merge branch 'main' into webrtc-voiceErik Kundiman
2024-08-08CR fixesRoxie Linden
2024-08-08Install GLH, Mikktspace, TinyEXR, TinyGLTF & LLCAErik Kundiman
automatically. Fix tab to spaces too.
2024-08-07Add Windows multi-pdb upload capabilityRoxie Linden
2024-08-07No need for custom target to generate contributorsErik Kundiman
The code is also moved to where it's relevant.
2024-08-07Generate InfoPlist.stringsErik Kundiman
It didn't work before because the destination folder wouldn't exist yet by the time it's configured, but CMake has been silent about it.
2024-08-07Install macOS executable without `make install`Erik Kundiman
Somehow the MACOSX_BUNDLE in add_executable isn't taking effect.
2024-08-06Build an xcarchive for mac symbol upload.Roxie Linden
2024-08-05Missed fileRoxie Linden
2024-08-05Simplify, reindent and minimise difference from LLErik Kundiman
This also contains removal of commented out lines that had previously been used to get macOS using SDL2 instead of Cocoa, and removal of dependency on SLPlugin when no media plugins are enabled (at all).
2024-08-03Merge branch 'webrtc-voice' into tmpErik Kundiman
2024-08-03Disable WebRTC on FreeBSDErik Kundiman
Vivox even got broken here. But at least this port is still very much alive. WebRTC is not going to kill our FreeBSD port.
2024-07-28Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into ↵Erik Kundiman
2024.06-atlasaurus
2024-07-27Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-23CMakeLists adding fsfloatersearch.hmobserveur
This commit completes the previous commit for the legacy floater
2024-07-20Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-17Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-15Merge branch 'main' into maint-bErik Kundiman
2024-07-14Performance and tuningmobserveur
Performance and tuning floater updated including fixes
2024-07-11Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-10Merge branch 'main' into maint-bErik Kundiman
2024-07-10`cpack -G Bundle` instead of `make install` on MacErik Kundiman
Root project finally renamed to Megapahit, which has a nice effect of CPack: - Run preinstall target for: Megapahit CPack: - Install project: Megapahit [] but it's really because CPack Bundle file couldn't be renamed via CPACK_PACKAGE_NAME like on DEB, RPM, and FREEBSD. CPack determines its own destination root folder, which is Resources (I didn't find a way to set it to Contents). fixup_bundle is now run on the .app deep inside CPack staging folders so that the dependency copies will be included in the DMG.
2024-07-09Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-09Merge branch 'main' into maint-bErik Kundiman
2024-07-09Remove code that'll never be reached by non macOSErik Kundiman
which would be to determine which media plugins should be added as dependencies. Plus minimise diff from SLv code.
2024-07-06Merge branch 'main' into maint-bErik Kundiman
2024-07-06tuning floater : missing cmakelists.txtmobserveur
missing cmakelists.txt from previous commit
2024-07-06Merge branch 'main' into maint-bErik Kundiman
2024-07-05Merge branch 'main' into webrtc-voiceErik Kundiman
2024-07-05macOS viewer_manifest.py not run if INSTALL is ONErik Kundiman
`make install` instead should do the job. Some generations haven't been reimplemented, including build_data.json, contributors.txt, and settings_install.xml.
2024-07-01Merge branch 'main' into maint-bErik Kundiman
2024-06-27Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voiceErik Kundiman
2024-06-27FontConfig's not used any more on macOSErik Kundiman
Since we stopped using SDL2 on it. It was added here before, I remember it was so it would build on macOS too.
2024-06-27Revert to using Cocoa instead of SDL2 for macOSErik Kundiman
Our SDL2-based code is kept Darwin-ready. This move was triggered by the merge with SLv's release/maint-b branch causing the viewer to show only a black screen, even though everything else seemed to be working (logging in, streaming, quitting the app). This decision also has caused numerous MPv specific window-related macOS bugs to be fixed. I wanted to commit this on the main branch, but somehow it failed to build. This move was bound to happen at the arrival of Maintenance B after all.
2024-06-20Merge remote-tracking branch 'secondlife/release/maint-b' into maint-bErik Kundiman
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-13Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden
2024-06-11Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voiceRoxie Linden