summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
2024-07-01Revert streaming to use LibVLC on FBSD & GNU/LinuxErik Kundiman
I couldn't make it to work with gstreamer even though everything was in place. It was already working anyway with LibVLC, and, Windows & macOS use it too, so it's actually the more cross-platform solution.
2024-07-01Fix core profile set not taking effect on SDL2Erik Kundiman
From https://wiki.libsdl.org/SDL2/MigrationGuide "So now that your window is back on the screen, let's talk strategy. SDL2 still has SDL_Surface, but what you want, if possible, is the new SDL_Texture. Surfaces are always in system RAM now, and are always operated on by the CPU, so we want to get away from there. SDL2 has a new rendering API. It's meant for use by simple 2D games, but most notably, it's meant to get all that software rendering into video RAM and onto the GPU. And even if you just want to use it to get your software renderer's work to the screen, it brings some very nice benefits: if possible, it will use OpenGL or Direct3D behind the scenes, which means you'll get faster blits, a working Steam Overlay, and scaling for free."
2024-07-01Get installed libmedia_plugin_gstreamer.so foundErik Kundiman
In viewer manifest the 10 suffix is removed, with CPack it might as well be named without the suffix. I haven't been able to get streaming working on FBSD, though. Maybe I need to install something.
2024-07-01sockaddr_in is defined in netinet/in.hErik Kundiman
2024-07-01Make it build for FBSD on SLv's Linux resurrectionErik Kundiman
2024-07-01ConfigurePkgConfig is not needed anymore after allErik Kundiman
FindPkgConfig does the work.
2024-07-01Revert "Stubs for missing implementations that use GTK"Erik Kundiman
This reverts commit e7ad9b00ce677fc38f0dec809dc160e7bb307dd2.
2024-06-30Fast timer view had a maybe uninitialised variableErik Kundiman
that GCC did't like. Adding a compile flag to the file didn't help somehow. So we're just initialising it with float 0.0.
2024-06-29Linden_Dollar_Background.pngfowlerdm
More transparency
2024-06-30Linden_Dollar_Background.png tweakfowlerdm
Less ugly alternative
2024-06-30first_login_image.jpg tweakfowlerdm
add pirate theme!
2024-06-30Window_Background/Foreground adjustmentfowlerdm
Make outline slightly less transparent
2024-06-30Merge remote-tracking branch 'mobserveur/main'Erik Kundiman