summaryrefslogtreecommitdiff
path: root/indra/llwindow/CMakeLists.txt
AgeCommit message (Collapse)Author
2025-06-03Exclude Windows from compiling SDL related filesErik Kundiman
2025-06-03Re-include GLEXT.cmake, but for Windows onlyErik Kundiman
There doesn't seem to be glext.h on Windows, so we'll just use the package from LL for now.
2025-05-22Merge branch 'main' into 2025.04Erik Kundiman
2025-05-13Not rely on (LL_)USESYSTEMLIBS macro & CMake settingErik Kundiman
but the fact that we keep on using as many system libraries as we can (and only resort to other sources in certain cases), hasn't changed, of course. Also stop having to set USE_AUTOBUILD_3P to OFF. Lines are reindented, and when a system library can be found for a dependency, then that should be the way. If later we find out that using some other way is better, than stick to that. So, one option at a time, whichever is best for the situation. GLEXT hasn't been used, and in order to be not having to hack its .cmake file, we bypass it and refer to GLH (which is still used) right away in LLWindow. CMake commands that need to be bypassed, if it's a one-liner then it's just commented out, but if it's multiple lines, then scope them with if (FALSE) to minimise difference.
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-01#3712 CMakeFindFrameworks deprecationAndrey Kleshchev
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-09-12Replace glh_linear usage with GLM (#2554)Rye Mutt
2024-07-01Merge branch 'main' into maint-bErik Kundiman
2024-06-27Revert to using Cocoa instead of SDL2 for macOSErik Kundiman
Our SDL2-based code is kept Darwin-ready. This move was triggered by the merge with SLv's release/maint-b branch causing the viewer to show only a black screen, even though everything else seemed to be working (logging in, streaming, quitting the app). This decision also has caused numerous MPv specific window-related macOS bugs to be fixed. I wanted to commit this on the main branch, but somehow it failed to build. This move was bound to happen at the arrival of Maintenance B after all.
2024-06-20Merge remote-tracking branch 'secondlife/release/maint-b' into maint-bErik Kundiman
2024-04-05Linux viewer (ReleaseOS) resurrection (#1099)Nicky Dasmijn
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-08-21Darwin not (directly) relying on Carbon & Obj-CErik Kundiman
HiDPI support & multi threaded OpenGL haven't been used since we switched to SDL2 on Darwin, and so far there hasn't been any sign that things aren't working any more significantly.
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-07-29The Linden libraries can be installed nowErik Kundiman
Useful when installed as shared libraries, so other viewer executables can share these libraries.
2023-07-29Setting BUILD_SHARED_LIBS on is now possibleErik Kundiman
by removing cyclic dependencies, and allowing shlib undefined on SLPlugin alone.
2023-07-19FreeBSD has SDL keyboard & window files built tooErik Kundiman
and any Linux SDL code should be applied to FreeBSD too.
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-06-23mac build fixMaxim Nikolenko
2022-06-20Cleanup dependency on ui libraries.Nicky
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-18Round one to support conan for 3P packages, this allows to build the viewer ↵Nicky
on Linux again.
2022-04-18Need to use list( APPEND ... to append to a list.Nicky
2022-04-18Introduce ll::fontconfig target (missing the correct link library, but at ↵Nicky
least this gets us compiling)
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
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-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-06Create and use sdl::sdl targetNicky
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-03-29SL-17005 WIP - Use D3D/DXGI to query for available VRAM on WindowsDave Parks
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-05-20Remove last occurence of DIRECTX_INCLUDE_DIR.Nicky Dasmijn
2020-05-20Remove DirectX.cmake. With recent SDKs (dating back to at least VS 2013Nicky Dasmijn
and the 8.1 SDK) DirectX is included in the SDK and does not need any special detection logic.
2020-05-11DRTVWR-476: Remove /showIncludes from llwindow project.Nat Goodspeed
2020-05-07DRTVWR-476: Whack-A-Mole not working, put switch on ALL llwindowNat Goodspeed
2020-05-07DRTVWR-476: Add /showIncludes to additional source files.Nat Goodspeed
Having it on just one source file was frustrating because the project build failed before it reached the one source file with the switch.
2020-05-07DRTVWR-476: Diagnostically /showIncludes for Windows SDK errorsNat Goodspeed
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-19Merge with viewer-release.Geenz
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-01Merge vwr-dev-matGraham Madarasz