summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-07-12Merge branch 'main' into maint-bErik Kundiman
2024-07-12Reimplementation of contributors.txt generationErik Kundiman
We don't rely on viewer_manifest.py's extract_names any more to generate the contributors list, it's implemented in CMake now, using sed, paste, and sort.
2024-07-12Simplify InfoPlist.strings configurationErik Kundiman
2024-07-12Fix version appearing as %%VERSION%% on macOS infoErik Kundiman
This would be done in viewer_manifest.py on SLv. This needed to be reimplemented, and now it is, just using CMake.
2024-07-11We're back to `make install` for macOSErik Kundiman
`cpack -G Bundle` just wouldn't play along well with code-signing and also broke Dullahan/CEF. The creation of the link to Applications in the AppleScript is now needed since we don't rely on CPack to make it for us any more.
2024-07-11Separate file for fixing Mac package dependenciesErik Kundiman
since the variable PACKAGE is not available to check any more by that stage.
2024-07-11Support for `make install` on macOSErik Kundiman
Just set CMAKE_INSTALL_PREFIX to the newview/Megapahit.app/Contents/Resources inside your build folder, and set PACKAGE to OFF.
2024-07-10Merge branch 'main' into maint-bErik Kundiman
2024-07-10Merge remote-tracking branch 'secretfoxtail/main'Erik 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-10toolbars.xml tweakfowlerdm
Modify default layout to hopefully be more tidy and useful
2024-07-10more panel_edit cleanupfowlerdm
Remove unneeded backgrounds
2024-07-10panel_edit_wearable cleanupfowlerdm
remove more unneeded unneeded background panels
2024-07-09Merge branch 'main' into maint-bErik Kundiman
2024-07-09Fix the variable used for macOS bundle identifierErik 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-09NDOF can be enabled for Space Navigator supportErik Kundiman
2024-07-08Explicit on every permission desired for DullahanErik Kundiman
otherwise those executables couldn't be read and therefore couldn't be copied for bundle preparation, for example.
2024-07-08GLH and Mikktspace can be untarred in packages nowErik Kundiman
They're custom anyway so very unlikely to be reused in other projects. TinyGLTF.cmake changes here just to minimise diff, the include directory setting does not have any effect (just like in TinyEXR.cmake).
2024-07-07Not set var to shorten paths in install scriptErik Kundiman
Somehow it wouldn't work.
2024-07-07Links to SLPlugin's dependencies after installErik Kundiman
cause SLPlugin's Frameworks wouldn't exist yet before installation.
2024-07-07Not override CMAKE_OSX_ARCHITECTURES to one archErik Kundiman
Now you can pass -DCMAKE_OSX_ARCHITECTURES:STRING=`uname -m` or -DCMAKE_OSX_ARCHITECTURES:STRING="arm64;x86_64" and it will build as intended.
2024-07-07Link CEF & chmod a+x Dullahan execs after installErik Kundiman
otherwise fixup_bundle would try to fix DullahanHelper executables when otool -L somehow can't find files that contain spaces in their names. By postponing the chmod until after fixup_bundle is called, fixup_bundle will ignore the DullahanHelper apps since they contain no executables yet by that time. Apart from that, trying to link to CEF would fail before installation cause SLPlugin's Frameworks directory wouldn't exist yet.
2024-07-07macOS install DESTINATIONs are relative paths nowErik Kundiman
but set CMAKE_INSTALL_PREFIX to newview/Megapahit.app/Contents.
2024-07-07`make install` on macOS installs CEF & DullahanErik Kundiman
Using file(CHMOD ... PERMISSIONS .._EXECUTE) somehow didn't work, so I had to set it to reinstall the Dullahan executables, and they are the only files that are required to be executable (CEF framework and the .dylibs aren't).
2024-07-07Fix paths to LibVLC files, they're in FrameworksErik Kundiman
Must have been residues before, they really were in llplugin/lib when I was doing the media plugin before.
2024-07-06Fill SLPlugin.app Frameworks directory with linksErik Kundiman
Adding custom command to fix SLPlugin's references wouldn't have any effect because fixup_bundle will overwrite them in install stage.
2024-07-06Fix paths to CEF media plugin dependenciesErik Kundiman
Explanation just like previous commit. There's a reference fix that doesn't seem to be valid any more. First of all, the path leading to CEF framework would be wrong, and secondly, the plugin doesn't seem to link to CEF.
2024-07-06Fix paths to LibVLC media plugin dependenciesErik Kundiman
Somehow fixup_bundle misses fixing the plugins. These fixes are in effect when MacPorts is used, though it wouldn't hurt if you're using HomeBrew, it's just you'd need to add the references to the HomeBrew libraries just like the MacPorts ones.
2024-07-06Merge branch 'main' into maint-bErik Kundiman
2024-07-06buffer optimisation llwindowsdl.cpp fixmobserveur
This commit fixes a gSavedSettings variable call
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-06missing header fix in llwindowsdl.cppmobserveur
there was missing include in llwindowsdl.cpp
2024-07-06Merge branch 'main' into maint-bErik Kundiman
2024-07-05Fix for the fps limiter on intel and amd cpusmobserveur
This commit fixes the fps limiter for intel and amd cpus
2024-07-05fix for the contextual menu issue in HiDPI modemobserveur
This commit fixes an issue with the contextual menu in HiDPI mode, as well as the positioning of object hover informations.
2024-07-05Tuning floater and buffer mapping improvementsmobserveur
This commit adds the tuning floater accessible via the fps button, and improvements to the buffer mapping optimisation modes.
2024-07-05Temporary Cocoa U16 vs. SDL2 U32 key typesErik Kundiman
Even when maint-b is merged to main, webrtc-voice will very likely still have to wait until it's merged with main to get maint-b's changes. I'll worry about the conflicts later, just so any branch would build on SDL2 or not without any patches.
2024-07-05`make install` on macOS copies dep libs to bundleErik Kundiman
I couldn't get CEF & Dullahan copied using this function. fixup_bundle on SLPlugin.app was considered invalid, however, SLPlugin itself gets install_name_tool changed but pointing to a non-existent Frameworks directory that would be in the SLPlugin.app bundle. We will have to create and fill such directory with links to the upper (the root viewer app bundle Frameworks') library copies ourselves. We wouldn't want fixup_bundle to successfully fill SLPlugin's Frameworks with copies instead of links anyway. See: `man cmake-modules` https://cmake.org/cmake/help/book/mastering-cmake/chapter/Install.html
2024-07-05`make install` on macOS installs SLPlugin appErik Kundiman
Turns out the custom command was only for bundling it, not necessarily installing it.
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-05libfmod.so files installed only if USE_FMODSTUDIOErik Kundiman
2024-07-05Reindentations & tabs to spaces to conversionsErik Kundiman
2024-07-05CPack packages licenses-linux.txt as licences.txtErik Kundiman
plus some reindentations.
2024-07-05`make install` on macOS copies resources to bundleErik Kundiman
Except for SLPlugin since there's already a custom command for it.
2024-07-01Merge branch 'main' into maint-bErik Kundiman
2024-07-01Start using SLv Dullahan on Linux too (v1.14.0-r2)Erik Kundiman
2024-07-01Get streaming to work again on FreeBSDErik Kundiman