bdc94eac5c
Merge remote-tracking branch 'origin/master'
2023-04-03 15:33:29 +01:00
82802e59f6
Wrong!
2023-04-03 14:34:42 +02:00
110096438e
Typo in CMake breaks Mac.
2023-04-03 13:14:41 +01:00
fc4181b478
Odd merge issue and ignore more crap.
2023-04-03 12:39:43 +01:00
377ee00657
Remove some apparently orphaned CMake files
2023-04-01 19:36:01 +02:00
934616de29
Linux: Restore more linux specific cmake configuration that went bye bye in the last merge - fixes the ability to toggle between internal/external browsers in preferences
2023-03-31 01:07:46 +11:00
e5c681ce8e
Linux: Restore crashreporting (hopefully)
2023-03-31 00:05:29 +11:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
40b731eb76
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
...
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
e07e23756d
Fix Linux build
2023-02-03 12:57:07 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
e60eb81d56
Linux: use system wide fontconfig instead of 3p library, if all goes well we can later remove it from autobuild.xml - patch by PorkChop, thank you!
2023-01-19 12:38:02 +01:00
a0ac418814
Let's add support for VS2022, shall we?
2023-01-17 15:59:44 +01:00
57e8cd490f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-23 10:00:44 +01:00
8f45ad9323
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-22 16:29:17 +01:00
026b8ff411
Update URL of message template
2022-11-21 20:40:50 +01:00
da8f95ad22
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 18:06:07 +01:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
66cecee628
Linux: Update fontconfig and freetype to remove old zlib dependency - Thanks to PorkChop!
2022-10-30 20:30:12 +01:00
2b65ae8215
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-15 17:33:22 +02:00
d4506967ed
SL-16542 Openjpeg's header should have remained unchanged.
2022-10-04 17:53:43 +03:00
7b2fa92f0e
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
# indra/newview/viewer_manifest.py
2022-10-04 14:17:44 +02:00
c844bf0ab8
SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and enable partial bitstreams
...
Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow.
I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way.
P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2022-10-01 11:25:14 +03:00
8c552b767f
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/newview/CMakeLists.txt
2022-09-21 17:08:36 +02:00
5a353bb7b2
SL-17238 Small cleanup
...
Implied 'branch' is now two different version-control systems behind
2022-09-21 11:01:01 +03:00
bfe7cbb136
SL-17238 Merged in NickyD's cmake changes
2022-09-21 07:45:38 +00:00
a441ce184f
DRTVWR-568: Stop suppressing unused variable warnings -- we fixed?!
2022-09-20 14:27:11 -04:00
45aef2c318
Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled
2022-09-20 19:29:39 +02:00
c607ff35d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/Python.cmake
2022-09-18 00:24:15 +02:00
6924ce21a0
Python cmake hack for GHA (you will need python >3.9 now)
...
this is to get around the issue of windows on github finding the wrong python in cmake due to our existing hacks for cygwin.
2022-09-17 22:28:05 +01:00
b810ad3104
Merge test cleanup.
2022-09-17 23:26:52 +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
7471788271
SL-17238 MacOS build does not recognize no-unused-but-set-variable
2022-09-17 19:30:31 +03:00
c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03: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
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
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
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
5883ff178b
SL-17657: Merge branch 'more-c++17' into DRTVWR-568.
...
Converting on DRTVWR-568 as the project branch going forward.
2022-09-01 14:07:52 -04:00
675cfedb8a
DRTVWR-568: Ensure parent directory exists before CREATE_LINK.
2022-09-01 12:27:08 -04:00
2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
ef58b9751a
DRTVWR-568: Pull in new 3p-colladadom build, tweak to VSVER number hardcoded into autobuild.xml for VS 2022 and update cmake script to copy the MSVC runtime (proper fix coming
2022-08-30 15:20:04 -07:00
592abc460c
DRTVWR-568: More cleanup of deleted obsolete std library features.
2022-08-26 22:49:16 -04:00
Beq