diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-02 22:34:49 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-02 22:34:49 +0800 |
| commit | cf4a370599ee98940ed09e92e5c4e3b43ba066b2 (patch) | |
| tree | 208dea6e3bb98c75b42cd6e9ce8f0d241659092c | |
| parent | 255feda44f858b23607ee4bcf21e5289f4323ffe (diff) | |
| parent | b26f77e2dc465fabc3ef220b1feabea951640031 (diff) | |
Merge branch 'main' into 2026.02
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | indra/llui/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -64,7 +64,7 @@ $ megapahit ### Fedora ``` -$ sudo dnf install cmake gcc-c++ patch patchelf rpm-build perl-FindBin apr-util-devel boost-devel boost-url expat-devel fltk-devel glm-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel v-hacd-devel vlc-devel libvorbis-devel libXcursor-devel libXfixes-devel libXinerama-devel xxhash-devel +$ sudo dnf install cmake gcc-c++ patch patchelf rpm-build perl-FindBin apr-util-devel boost-devel boost-url expat-devel fltk-devel glm-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel sdl2-compat-devel v-hacd-devel vlc-devel libvorbis-devel libXcursor-devel libXfixes-devel libXinerama-devel xxhash-devel $ export LL_BUILD="-O3 -std=c++20 -fPIC -DLL_LINUX=1" ``` build with FMOD Studio: ([register with fmod to get linux package][fmod] and then place the `.tar.gz` in `~/Downloads`) diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 83b3a220a0..9077670b67 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -274,6 +274,10 @@ target_link_libraries(llui include(LibraryInstall) +if (CMAKE_CXX_COMPILER_ID MATCHES GNU) + set_source_files_properties(llxuiparser.cpp PROPERTIES COMPILE_FLAGS -Wno-sfinae-incomplete) +endif () + # Add tests if(LL_TESTS) include(LLAddBuildTest) |