summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-12-25VLC & CEF can be easily optional in newview CMakeErik Kundiman
2023-12-15Merge tag '7.1.1-release'Erik Kundiman
source for viewer 7.1.1.7039128750
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-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-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-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
2023-09-02SL-19243: Post xcarchive.zip instead of separate symbols tarball.Nat Goodspeed
On Mac, in the CMake USE_BUGSPLAT logic, we created both xcarchive.zip (which is what BugSplat wants to see) and secondlife-symbols-darwin -64.tar.bz2 (which we don't think is used for anything). The tarball was posted to codeticket -- but why? If the point is to manually re-upload to BugSplat in case of failure, we'll do better saving xcarchive.zip to codeticket. For SL-19243, posting xcarchive.zip directly supports the goal of breaking out the upload to BugSplat as a separate step. Anyway, since xcarchive.zip is a superset of the tarball, the tarball can be recreated from the zip file, whereas the zip file can't be recreated from the tarball without opening the .dmg installer and extracting the viewer executable. If the xcarchive.zip file exists (that is, on Mac), post that to codeticket or GitHub, as applicable, instead of the tarball. In fact, in the USE_BUGSPLAT case, don't even bother creating the tarball since we're going to ignore it. Make the new build.sh logic that insists on BUGSPLAT_USER and BUGSPLAT_PASS conditional on BUGSPLAT_DB.
2023-08-28Replace SL & Linden brands on macOSErik Kundiman
2023-08-26CPack for packaging (when PACKAGE set to on)Erik Kundiman
Since we could use the dynamic versioning from the configuration phase of CMake, the inclusion is put in BuildVersion.cmake. Other CPACK variables are usually static so can be set when running cmake. CPack somehow doesn't pick up the DESTINATION values in ViewerInstall (slplugin & libvlc too) from UnixInstall, so they're they're partially hardcoded again there.
2023-08-21SL-20145 New inventory feature notificationAndrey Kleshchev
Pulled in relevant parts from SL-19929
2023-08-21Apple Clang doesn't recognise --as-neededErik Kundiman
2023-08-21DBus hasn't been enabled, so why compile api_dbusErik Kundiman
So it won't get in the way for other platforms that have no DBus.
2023-08-21Darwin & any platform can, and should, use SDLErik Kundiman
The alt mouse click to cam is broken for now on macOS, but this is the path we've chosen.
2023-08-21Any platform can, & should, use appviewerlinux tooErik Kundiman
It's the one that plays along with SDL.
2023-08-21Revert "FreeBSD can use llappviewerlinux too"Erik Kundiman
This reverts commit 8356386f6674cf7f1e25bcd49f3266868cd5dc7d.
2023-08-07Make GCC not treat uninit-ed FetchEntry as errorErik Kundiman
2023-07-29Viewer & resources can be installed on the systemErik Kundiman
2023-07-29stringop truncation warnings aren't errors on GCCErik Kundiman
2023-07-29So we don't get errors from uninitialised varsErik Kundiman
when compiling newview using GCC.
2023-07-29Start adding LibVLC support when using system libsErik Kundiman
Streaming is not working yet, though. Until it's made sure that the dynamic library and plugins needed are on the paths the executable is expecting them to be.
2023-07-29Revert "VLC & CEF aren't deps when no media plugins on mac"Erik Kundiman
This reverts commit f4c8949ac66d08263845f60a7cef2ecb9c77079b.
2023-07-19No dangling gsl warning on newview with ClangErik Kundiman
2023-07-19FreeBSD can use llappviewerlinux tooErik Kundiman
2023-07-19Disable packages info when using system librariesErik Kundiman
For now. Maybe.
2023-07-19VLC & CEF aren't deps when no media plugins on macErik Kundiman
2023-07-19Disable viewer manager when using system libsErik Kundiman
2023-07-19Disable LLCA when using system libs for nowErik Kundiman
2023-07-19Disable DBusGlib when using system libsErik Kundiman
It's deprecated anyway.
2023-07-19Disable JS packages when using system libs for nowErik Kundiman
2023-07-19LL physics extensions stubErik Kundiman
Since the CMakeLists.txt includes some same .cmake files as the viewer, I think the project might as well be a part of the Linden libraries code. And for now is put under llprimitive (might not be consistent, in fact the opposite, with they way llplugin relates to slplugin), but I think this way results the least change, and it still works. The differences include: - all files (common llphysicsextensions headers to be included by library users and the stub implementation files) are put inside one directory, and the CMakeLists.txt is adjusted accordingly; - modernised CMakeLists.txt, so include_directories are now implied by target_link_libraries; - some file name fix; - add_library is not explicitly set to STATIC;
2023-06-29SL-19929 New inventory feature notificationAndrey Kleshchev