de9374f0eb
Remove redundant USE_TRACY option
2024-08-21 03:14:39 +02:00
5e75273b49
Merge branch 'webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llagent.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-03-19 17:09:42 +01:00
0ae8bbaf5d
Checkpoint WebRTC Voice
2024-02-08 18:34:00 -08:00
63151d5c6d
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llurlentry.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llvoavatarself.h
2023-07-18 00:16:15 +02:00
8e70575be8
SL-18837: Remove C++17 override, given build-variables change.
...
Until now, the viewer has explicitly set(CMAKE_CXX_STANDARD 17) with a comment
explaining that we hadn't dared add -std=c++17 to build-variables/variables
because we didn't know if we could build all the component autobuild packages
with that switch. Now that we've successfully built all of them with that
switch, we've updated the viewer branch of build-variables, so we can remove
the viewer's CMAKE_CXX_STANDARD override.
2023-05-12 09:42:19 -04:00
a1d1d8838f
Remove duplicate setter for C++ language standard
2022-09-17 23:20:01 +02: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
c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03:00
0e325eab28
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
2022-09-17 14:37:33 +02:00
0da3dd27fc
SL-17238 Fix coding policy build issues
2022-09-17 14:03:55 +03:00
7a71cea15b
Workaround to keep old cmake versions limping around.
2022-09-17 12:02:25 +02:00
31341ac605
Settings the startup project must come *after* add_subdirectory(newview). Only after this directory is added the target will be known and can be manipulated.
2022-09-16 23:53:32 +02:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
56d5666f9a
DRTVWR-568 need to update cmake minimum
2022-08-30 14:43:34 -07:00
718f9fdf7a
Set correct root project name and build type in CMake and don't use VSTool by default
2022-08-13 17:09:24 +02:00
4d5b5a5ae3
Enable c++17 since it seems LL is hesitant to finally do it...
2022-08-11 21:56:48 +02:00
5230df4b14
Linux - Update 3p libs, fix linux-crash-logger, contributed by Pork Chop, thank you!
2022-08-01 13:35:25 +02:00
3f31d0b5a7
Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan.
2022-07-17 17:51:25 +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
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# 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-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# 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-27 02:51:33 +03:00
d6b34d41af
Finishing touches, making sure even with conan all needed 3ps are installed and usable.
...
This brings the source to be able to run tests in conan mode.
2022-04-19 20:28:34 +02:00
1aaa765d26
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 12:33:48 +02:00
2b151e0aef
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
2022-04-18 18:11:43 +02:00
5aa81b1659
Remove obsolete targets and dependencies.
2022-04-18 03:14:49 +02:00
a9774d3427
Request C++ standard via standard cmake.
2022-04-16 15:35:13 +02:00
b9f94c0897
Now there is a oslibrary target get rid of some more obsolete vars:
...
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16 15:33:32 +02:00
0980a94341
Bump cmake version needed up to 3.16 so target_precompile_headers can be
...
used.
2022-04-09 20:15:07 +02:00
6e1ae6ec7b
Raise the bar to cmake 3.13, this gives access to more modern
...
constructs.
2022-04-09 19:03:44 +02:00
b79d1ac171
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-08 14:19:36 +01:00
ba12815f7c
Let's just use add_compile_definitions because... future and stuff...
2022-03-02 13:56:13 +01:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
e10dea5fe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 18:09:12 +01:00
1168b43580
Windows; use VS_DEBUGGER_WORKING_DIRECTORY to get rid of vstool if
...
possible. Enable by passing --no-vstool to configure
2022-02-26 13:55:14 +01:00
0aa59b2bee
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-22 13:40:40 +01:00
94e9141033
Initial changes to bring back crash dump uploading
2022-02-20 18:32:15 +01:00
a0837a5298
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-14 13:46:29 +01:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
171c00d0bb
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-28 12:48:13 +02:00
12d68c3f6c
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.h
2021-10-22 16:29:58 +03:00
3c2ccd879c
Merge with master after latest Viewer release
2021-10-13 16:54:08 -07:00
20e05a5c11
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
2021-10-14 01:01:09 +03:00
bff236d893
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-10-12 14:27:41 +02: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
454b029d9c
DRTVWR-543: Fix local Mac builds with BugSplat. (Thanks NickyD!)
...
With the affected line, local Mac builds with BugSplat enabled fail. Without
it, they build clean.
2021-09-27 13:44:09 -04:00
53fa59c6af
Calling include(bugsplat) in indra/CMakeLissts.txt is wrong.
2021-09-26 11:32:09 -04:00
a791a22b1b
SL-14541 remove mac-crash-logger
2021-09-09 02:17:36 +03:00
Ansariel