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
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +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
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
a4e2734372
Use kdu target
2022-04-06 20:23:21 +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
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
b2569a06e6
Windows; Update KDU to 8.2
2021-08-23 17:55:59 +02:00
20cd749175
Instrument threaded texture decode
...
includes fix for timeout in slow decoded bakes
2021-05-28 02:22:53 +01:00
fd19a25282
KDU 8.1 for macOS.
2021-04-03 10:20:57 -05:00
b25a3e5448
Correct KDU version check.
2021-03-28 14:09:39 +02:00
8387c0e6cf
Linux; KDU update
2021-03-23 17:47:31 +01:00
4a3d77033d
Move disabling of KDU-specific Clang warning to include_kdu_xxxx.h
2020-10-09 08:34:55 +02:00
ae9f77182b
Multi-threaded KDU works fine on Windows - re-enable it
2020-10-09 08:33:13 +02:00
2e179112c7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-01 09:46:00 +02:00
7e97addca3
Fix KDU image encoding for KDU >= 8.0.4
2020-07-28 18:35:38 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
c16a364377
There was an idiom to test with LL_DARWIN if the compiler used is clang. This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ ( https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros )
2020-07-22 06:48:15 +03:00
f116ea4cb7
Merge remote-tracking branch 'fs/master' into fs-vs2017-d476
...
(Note: This removed our changed dullahan, but that's okay as it is
vs2013)
2020-07-20 09:58:30 +02:00
449f7fe8e8
Change #if LL_DARWIN to #if __clang__ as clang can be used on Linux too ...
2020-07-17 20:26:02 +02:00
d6baa7a853
DRTVWR-494: Put streaming operator<<() for kdu_dims in kdu_core.
...
It seems the lookup now requires that the operator<<() function be defined in
the same namespace as the argument.
2020-03-25 15:28:17 -04:00
a135b5b428
Merge remote-tracking branch 'origin/ll-vs2017' into fs-vs2017
2019-12-21 13:14:51 +01:00
5469b246d2
Compile time compatibility for KDU 8
2019-12-09 22:06:14 +01:00
65e00abe6f
DRTVWR-494: Put streaming operator<<() for kdu_dims in kdu_core.
...
It seems the lookup now requires that the operator<<() function be defined in
the same namespace as the argument.
2019-12-06 16:02:28 -05:00
987b890df8
KDU update.
2019-05-28 00:12:49 +02:00
ffc621be27
Merge viewer-cougar
2018-05-30 21:29:41 +02:00
f86073d609
Fix broken integration and unit tests.
...
Update KDU stubs in integration test.
Work around MAINT-8675 stale cert in llsechandler_basic for now.
Update stubs for LLTrans::getString in handful of integration tests.
2018-05-21 17:54:54 +01:00
b56c2a790e
Fix Windows build
2018-01-27 11:43:30 +01:00
2e644b4911
Compile fixes for Xcode 9 (and probably gcc).
2018-01-27 02:02:16 -06:00
127809e241
Merge with viewer64.
2017-04-10 15:15:11 +02:00
1771857e6c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-03-06 14:27:29 -05:00
25cd2ed205
Merge
2017-01-25 11:13:59 -08:00
29543e2572
Remove obsolete code.
2017-01-11 02:24:51 +01:00
966c1f36c5
Fix compile error, KDU_X86_INTRINSICS was defined multiple times.
2017-01-11 00:33:20 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
7b2cf53f78
Pull in new version of KDU third party package that is build (correctly) as a static library vs. a stub library/DLL
2016-11-30 12:21:05 -08:00
b9cc216b9c
DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN.
2016-11-23 12:07:31 -05:00
b1185eca82
DRTVWR-418: Fix Windows line endings in include_kdu_xxxx.h
2016-11-17 08:59:01 -05:00
0413e40d82
DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes.
2016-11-03 20:48:41 -04:00
6cc4a8dcd2
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-11-03 09:31:15 -04:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
8d86f5a0c4
Merge
2016-09-16 16:00:07 -07:00
51236b7c9c
Merge
2016-09-14 09:55:18 -07:00
c7cb6636c4
MAINT-6584, MAINT-5011: Change new 'throw' to LLTHROW()
...
to be consistent with new exception conventions.
2016-09-07 10:57:07 -04:00
dd1a0218b1
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
2016-09-07 10:46:28 -04:00
c2b88ca860
Build fix for KDU 7.5+
2016-08-29 21:30:03 +02:00
Ansariel