b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
536c821c09
MacOS companion changes for dullahan 1.21 including package structure and linkage fixes
2025-08-27 23:05:40 -04:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
363f2df4fa
Remove function create_target and instead directly use add_library
2022-04-17 18:28:55 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
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-17 18:04:57 +02:00
6d0bba9c03
Switch over to standard target_link_libraries (cmake requirements are high enough now).
2022-04-17 17:32:14 +02:00
241919e7f7
Rework cmake, the original plan was to maybe be able to use conan targets 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-13 19:21:55 +02:00
d3521b4462
Remove obsolete and unmaintained USE_SYSTEMLIBS
2022-04-13 10:28:46 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
76b932e008
Merge branch 'DRTVWR-520-apple-notarization' of https://bitbucket.org/lindenlab/viewer
2021-05-02 01:06:17 +02:00
680f2cfee6
Xcode12 linking fix (CEF)
2021-04-09 19:16:34 +03:00
493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
15b13608ba
Merge branch 'master' into linux-updates
2020-07-23 23:40:41 +02:00
3b05e792c5
Updated 3Ps for GCC 5.4.0.
2020-07-20 19:26:02 +02:00
2fb5022185
Merge with viewer-release_linux. Open issues:
...
- switch back to OpenJPEG2
- Reimplement packaging logic for flatpak/snap/docker.
- Remove libvlc for Linux builds
- Remove gstreamer010 for Linux builds.
2019-03-04 08:04:58 +01:00
9029d85de2
Use find_library when building standalone.
2019-01-23 19:24:14 +01:00
ed6780c40b
Linker settings for Linux/CEF
2019-01-23 18:38:25 +01:00
bb9a6326a7
Tweak GCC test a little so it works with older cmake versions.
2018-05-22 07:12:31 +02:00
61008b4059
Add a dullahan version for GCC5+, this is exactly the same source as the "normal" version, just compiled on Ubuntu 16.04 with GCC 5.4.0. This allows self compilers to compile with a newer GCC instead of alwayss having to fall back to GCC 4.9.x
2018-05-22 05:01:34 +02:00
0d6cd1bf62
Linux: Reorder link order, or we're getting errors about AtomicOps_Internalx86CPUFeatures being undefined.
2018-03-26 23:20:40 +02:00
87dd703188
dullahan for Linux.
2017-04-12 16:10:47 +02:00
127809e241
Merge with viewer64.
2017-04-10 15:15:11 +02:00
5534ab4e18
First round of changes to replace LLCEFLib with Dullahan. Mostly Windows changes in this batch since I'm working on Windows box but some speculative macOS ones too although they are quite untested
2017-02-21 15:06:21 -08:00
c410f6d076
CEF-linking for Linux.
2015-09-25 10:44:33 +02:00
ac88d58ff5
Changes to let CMake generate determine where the build files for OS X CEF media plugin are
2015-06-10 18:32:41 -07:00
6c20327357
Fixed for OS X version - in progress
2015-06-08 16:47:16 -07:00
834a94caec
point to new cef tpl with right headers, update cmaake and viewer_manifest logic to copy files to right place
2015-03-26 04:35:13 +01:00
d368babe7c
Make VS2013 look inside include/cef folder for headers
2015-03-25 16:16:51 -07:00
0fe901d67e
Point to initial pass at a CEF package in autobuild and make sure autobuild configure picks it up
2015-03-25 15:42:35 -07:00
dbdef626d6
Add new media plugin (currently renders squares as example) in preparation for new CEF code
2015-03-24 17:22:58 -07:00
Ansariel