summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-09-05Initial prototype of embedded LUAMnikolenko Productengine
2023-02-03Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2022-12-13Merge branch 'main' into DRTVWR-539Mnikolenko Productengine
# Conflicts: # doc/contributions.txt # indra/newview/llappviewer.cpp # indra/newview/skins/default/colors.xml
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-22Merge branch 'DRTVWR-568' into DRTVWR-539Mnikolenko Productengine
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-09-21SL-18202 WIP merging autotune contribution and updating UIMnikolenko Productengine
2022-09-21Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-09-17Remove some leftovers of the old precompiled headers usage. Pointed out by ↵Nicky Dasmijn
Ansariel Hiller.
2022-09-17Merge test cleanup.Nicky Dasmijn
2022-09-17SL-17238 Supress errors from physicsextensionsAndrey Kleshchev
2022-09-17Cleanup sweepNicky Dasmijn
2022-09-17cmake playing jedi mind tricks on me and making me missNicky
one genex that needed changing. Interstingly add_custom_target will not complain about a file that would never be declared as OUTPUT and thus is not really a valid cmake build target.``
2022-09-17Try to make sure this also works with the havok version of llphysicsextension.Nicky Dasmijn
2022-09-16Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.Nicky Dasmijn
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-07-20SL-17670 remove tab charactersMnikolenko Productengine
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-29Merge branch 'master' into DRTVWR-539Mnikolenko Productengine
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-483Andrey Kleshchev
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-06-20Cleanup dependency on ui libraries.Nicky
2022-06-06SL-15312 Larger image previewAndrey Kleshchev
At the moment without cursor handling
2022-06-05Port new cmake files (Trace/Meshoptimizer) to modern cmakeNicky
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31SL-15312 Tweaks and fixesAndrey Kleshchev
- Allowed resizing text fields for classifieds in profiles - Fixed mislabeled floater from picks to classifieds - Fixed classified floater's title - Added support to see multiple classifieds - Removed obsolete panels - Fixed pick requests for various menus - Fixed pick creation from landmarks - Improved online status handling - Updated headers in files
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-05-08- Slightly better documentation string for --configuration, as this really ↵Nicky
is used for the configs build subdirectory. - Always pass the correct configuration for --buildtype - Use 'buildtype' when determining defbug/release/... build. --configuration should not be used for this, as it is the subdirectories name (CMAKE_CFG_INTDIR)
2022-05-07Adapt gnerator expression usage to work on OSX.Nicky
2022-05-01Another place that needed generator expressions.Nicky
2022-05-01Simplify cmake files by uaing generator expressions and be moreNicky
configuration specific, rather than staging files to Release and RelWithdebInfo all the time
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-26Merge branch 'DRTVWR-546' into DRTVWR-539Mnikolenko Productengine
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-18Remove obsolete targets and dependencies.Nicky
2022-04-17Remove function create_target and instead directly use add_libraryNicky
2022-04-17Switch over to standard target_link_libraries (cmake requirements are high ↵Nicky
enough now).
2022-04-16Streamline fmodstudio/openal targets:Nicky
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp - Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used. - To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-16Remove undefined variablesNicky
2022-04-16Pull in LL_GLOD=1 via target, not by hand crafted magic.Nicky
2022-04-16Use variable LLSTARTUP_COMPILE_FLAGS only when it is defined.Nicky
2022-04-16Remove some more obsolete includes (UnixInstall) and include_directories()Nicky
2022-04-16create target ll::uilibraries to have one common target that defines what eachNicky
operation system needs as dependencies on OS gui libraries.
2022-04-16Go back to more modern way to compile the physics stubNicky
2022-04-16Now there is a oslibrary target get rid of some more obsolete vars:Nicky
LEGACY_STDIO_LIBS (was only used for Windows) PTHREAD_LIBRARY (only Linux) LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)