9e19e6712b
updates for GHA to get windows to work.
...
also requires python hackery pushed as separate commit pending a better solution.
2022-09-17 22:26:27 +01:00
449f53db81
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-17 23:24:25 +02:00
a1d1d8838f
Remove duplicate setter for C++ language standard
2022-09-17 23:20:01 +02:00
3ae2e0d428
Don't need to compile llviewerprecompiledheaders.cpp anymore - CMake will now take care of the precompiled headers
2022-09-17 23:18:22 +02:00
951034d7e6
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/00-Common.cmake
2022-09-17 23:14:56 +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
815bcc31b1
FIRE-31979, FIRE-32057, FIRE-32096, FIRE-32122 alpha texture batch issue
2022-09-17 21:56:14 +01:00
3c6e2a6e4c
SL-17238 Supress errors from physicsextensions
2022-09-17 22:37:43 +03:00
80ed990260
Fix for edge case of empty materials not batching
2022-09-17 20:13:15 +01:00
8f90c17fca
FIRE-32147 Russian translation update, by Romka Swallowtail
2022-09-17 21:03:23 +02:00
7471788271
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 19:30:31 +03:00
c82f70ecac
SL-17238 bugsplat build issues
2022-09-17 19:30:31 +03:00
c333a7935d
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 19:30:31 +03:00
9bad5d08fb
SL-17238 Large cmake contribution by NickyD
2022-09-17 19:30:31 +03:00
c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03:00
c47b2ae745
We probably want this (have to guess as I cannot run the tests).
2022-09-17 17:58:08 +02:00
b33de4fb08
Merge branch 'DRTVWR-568_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-568_cmake
2022-09-17 17:39:00 +02:00
e840b5eb40
MacOs packaging is weird, as Nat already did point out :(
...
Part of his change was omly taking Release builds into account, the other
part from me made the same mistake.
Use a generator expression with a custom command to get the symlink the way
we want.
2022-09-17 17:37:45 +02:00
8e0b039e55
Cleanup sweep
2022-09-17 17:14:16 +02:00
9af15d2cb7
Merge branch 'DRTVWR-568_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-568_cmake
2022-09-17 16:54:35 +02:00
0e5251f7ce
cmake playing jedi mind tricks on me and making me miss
...
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-17 16:50:38 +02: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
a35e58b719
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 14:44:14 +03:00
9e537416f1
SL-17238 bugsplat build issues
2022-09-17 14:04:21 +03:00
d42ea69ea6
SL-17238 Fixed llphysicsextensions connection to llrender
2022-09-17 14:03:55 +03:00
248bf15ce8
SL-17238 Large cmake contribution by NickyD
2022-09-17 14:03:55 +03:00
0da3dd27fc
SL-17238 Fix coding policy build issues
2022-09-17 14:03:55 +03:00
8c1427c39f
Only set include property on ll::bugpsplat target when on Windows.
...
The include was preveiously declared for all platforms, but the Mac
package does not even ship this include directory. With the new way
cmake works this will lead to an error (which is good, so we don't
end with bogus include dirs).
2022-09-17 12:57:49 +02:00
7a71cea15b
Workaround to keep old cmake versions limping around.
2022-09-17 12:02:25 +02:00
68c680599b
Try to make sure this also works with the havok version of llphysicsextension.
2022-09-17 11:21:06 +02:00
85db6ad4d5
New CEF and Dullahan for Linux, picking up fixes for MOAP issues - new libraries built by PorkChop. Thank you!
2022-09-17 05:41:29 +02:00
a22eb0ead9
why did only clang spot this?
2022-09-17 00:17:44 +01:00
c17e960a00
Merge remote-tracking branch 'origin/master'
2022-09-17 00:17:15 +01: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
554717044f
Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps honestly bug me.
2022-09-16 23:24:39 +02:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
5f1c8d3119
SL-18068: Update to viewer-manager build 575083
2022-09-16 16:24:05 -04:00
21182739d9
Updated Polish translation, minor changes in English one (local mesh)
2022-09-16 18:12:51 +02:00
56e1db9c15
SL-18119 - UIUsage logs for some common operations
2022-09-16 17:09:55 +01:00
12e58502e6
Fixes for pedantic compilers and cross platform oopsie
2022-09-16 13:04:52 +01:00
1a0ba35b9c
Merge remote-tracking branch 'origin/master'
2022-09-16 11:21:15 +01:00
972021afe2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-16 09:29:29 +02:00
caba96cc65
Add some cruft to make it build again...
2022-09-16 09:28:50 +02:00
1d0324dbda
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-09-16 08:42:35 +02:00
53026d5cc9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-16 08:42:00 +02:00
2e2d500377
Create build_viewer.yml
2022-09-16 02:25:50 +01:00
d31a2dacba
Merge integration of Vaalith's Local_mesh to main
...
Initial release of local mesh support.
Local mesh implementation by Vaalith Jinn
2022-09-16 01:22:25 +01:00
d6f6199bc0
Add setting to help Maya users.
...
Need to backport this setting to mesh uploader too
2022-09-16 01:16:02 +01:00
720e8f410f
Disable VSync by default as it is more trouble than it is worth
2022-09-16 01:09:59 +01:00
f08f20db5f
Merge branch 'master' into DRTVWR-568
2022-09-15 17:00:34 -07:00
Beq