summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2024-03-06SL-20429 Fix emoji categories having mixed translationsAndrey Kleshchev
Was caused by package substituting '&' with 'and' instead of '&'
2024-03-05Remove more orphaned filesAnsariel
2024-03-02Update copyright year to 2024 (on macOS)Erik Kundiman
2024-03-02Merge tag '7.1.3-release'Erik Kundiman
source for viewer 7.1.3.7878383867
2024-03-01Merge remote-tracking branch 'origin/release/gltf-maint2' into ↵Brad Linden
release/materials_featurette
2024-03-01Merge branch 'main' into marchcat/yz-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2024-02-23remove another unused old macOS fileLars Næsbye Christensen
2024-02-17remove obsolete Mac Rez fileLars Næsbye Christensen
2024-02-08copy llwebrtc.dll to the right place on build.Roxie Linden
2024-02-08remove unnecessary build fileRoxie Linden
2024-02-08Checkpoint WebRTC VoiceRoxie Linden
2024-02-09SL-19585 Try replacing fmod with openalAndrey Kleshchev
Since now VLC is responsible for played parcel media (should be since SL-19042) should be possible to switch remaining audio to OpenAL with no loss of functionality
2024-02-05Merge branch 'DRTVWR-599-maint-Z' into release/maint-yzAndrey Lihatskiy
# Conflicts: # indra/newview/llchiclet.h
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-19SL-20606: Full GLTF material preview. Works for most materials.Cosmic Linden
2024-01-18Minor fix to previous commit, on scope endingErik Kundiman
2024-01-18GNU/Linux internal web browserErik Kundiman
The lllibs need to be built as static libs now, otherwise SLPlugin would lose reference to gSavedSettings. The media plugins still need to be built as dynamic libs however, so they can't rely on the condition in LibraryInstall.cmake any more. Since the Megapahit viewer, when built using GCC, is using the default value for _GLIBCXX_USE_CXX11_ABI (which is 1 for the newer C++11 ABI as opposed to 0 for the older C++03 ABI), the Dullahan dependency needs to be built with the very same _GLIBCXX_USE_CXX11_ABI setting too, otherwise apr_dso would fail at loading libmedia_plugin_cef.so because of the failure to refer to the setOnConsoleMessageCallback function with strictly the same (not differing between std::__cxx11::basic_string vs. std::basic_string) parameter types. The CEF build is Spotify's, so no live streaming support, while the Dullahan package used by the viewer was built using Kokua's dullahan fork. After rebuilding it with _GLIBCXX_USE_CXX11_ABI kept at default by not overriding it in variables (from the build-variables repo), the order of the target link libraries in CEFPlugin.cmake doesn't seem to matter any more (it did before!). Now EXTERNAL_TOS can be safely omitted from GNU/Linux added compile definitions (but still used on FreeBSD).
2024-01-09Fix project structure generated by CMakeAnsariel
2023-12-25VLC & CEF can be easily optional in newview CMakeErik Kundiman
2023-12-18Merge branch 'main' into DRTVWR-594-maint-YAndrey Lihatskiy
2023-12-15Merge tag '7.1.1-release'Erik Kundiman
source for viewer 7.1.1.7039128750
2023-12-15Merge branch 'main' into DRTVWR-489Andrey Lihatskiy
# Conflicts: # indra/newview/fonts/DejaVu-license.txt # indra/newview/fonts/DejaVuSans-Bold.ttf # indra/newview/fonts/DejaVuSans-BoldOblique.ttf # indra/newview/fonts/DejaVuSans-Oblique.ttf # indra/newview/fonts/DejaVuSans.ttf # indra/newview/fonts/DejaVuSansMono.ttf
2023-12-14macOS internal web browserErik Kundiman
Just untar Dullahan package manually in prebuilt libs dir.
2023-12-06Revert "Not build libvlc on macOS for now"Erik Kundiman
This reverts commit 46273f40e8116a06bf7460903a1451e88ca2fad4.
2023-12-05Merge branch 'main' into DRTVWR-489Alexander Gavriliuk
2023-11-30Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp # indra/newview/skins/default/xui/en/notifications.xml
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-06Merge commit '439d26ccdc2864794036a8f6432664755f2b8234' into testErik Kundiman
2023-10-26SL-20536: Fix build error C1128. secondlife-bin object file too big. Compile ↵Cosmic Linden
with /bigobj
2023-10-26Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-10-26D587 Post merge fmod issues fixAndrey Kleshchev
2023-10-25Merge branch 'viewer_bulky_thumbs' into marchcat/maint-Y-bulky-thumbsAndrey Lihatskiy
# Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-10-16Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-10-14Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-10-14Not build libvlc on macOS for nowErik Kundiman
At runtime it hasn't worked anyway. And now we can get an ARM build without having to build libvlc for ARM first.
2023-10-08Merge branch main into DRTVWR-489Alexander Gavriliuk
2023-10-04SL-18837: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
2023-10-04GCC build fixesErik Kundiman
which includes another misleading indentation.
2023-10-04Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-10-04GCC build fixesErik Kundiman
which includes another misleading indentation, and a double use of the variable is_asset_knowable.
2023-10-04Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-10-04src in inventory gallery is set but unusedErik Kundiman
It was okay on FreeBSD's Clang, but an error on AppleClang and GCC too.
2023-10-04Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-04Merge tag '6.6.15-release'Erik Kundiman
source for viewer 6.6.15.581961
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-15More maybe uninitialised in model previewErik Kundiman
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-10macOS still uses viewer_manifest for nowErik Kundiman
until we're ready with CPack for it.
2023-09-07SL-18837: Without USE_BUGSPLAT, no target generate_symbols.Nat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 15:34:46 +0000