869c42e2a9
Add static libraries to SMAKE find_package rules on Linux only
...
Might want to ad this for apple later as we sem to have inherited a lot of overspecified lib names in the update
2025-11-17 17:55:42 +00:00
a7fe0c1d78
Merge branch 'release/2025.07' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llopenglview-objc.mm
2025-09-12 12:42:49 +02:00
452c8e0ea4
Follow up fixes for Apple Silicon ( #4662 )
...
* Remove GLM sse flag from cmake that was moved to llpreprocessor.h
* Further reduce performance loss of HDR and Sharpening on bandwith-constrained gpu by combining gamma correction into tonemap/sharpening shader passes
* Update SSE2NEON to 1.8.0 to fix random render nans
* Fix occasional startup crash from LLCachedControl being declared in global scope
2025-09-11 20:54:32 -04:00
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
a46d4f0f69
Enable deprecation warnings and suppress a small handful that have no modern replacements
2025-08-22 03:32:02 -04:00
6f21013d89
Fix long standing build issue due to bug in build variables
2025-08-16 13:38:27 +02:00
1f28648b8a
Use fp:precise to eliminate issues with NaN comparisons
2025-04-16 22:32:56 +01:00
97085ed300
Merge branch 'release/2025.03' into rye/forevermac
2025-03-13 05:28:36 -04:00
750099db68
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/llproxy.cpp
# indra/llui/llfolderviewitem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llviewerprecompiledheaders.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
# indra/newview/viewer_manifest.py
2025-03-12 19:31:51 +01:00
d915cf17df
Try to parallelize xcode builds further and add more headers to PCH to reduce build time
2025-03-12 18:37:27 +02:00
9b060f7fcc
Fix deprecation warnings under C++20 on MSVC
2025-02-11 05:04:11 -05:00
a455d3ee7d
Introduce build system and preprocessor support for ARM64
2025-02-11 05:04:08 -05:00
51ed6b5424
Update to use universal build flags and fix cmake deprecations
2025-02-11 05:04:05 -05:00
1cca913ba7
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodelloader.cpp
# indra/llrender/llgl.h
# indra/llrender/llrender.h
# indra/llui/llurlentry.cpp
# indra/llui/llurlentry.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvoavatar.cpp
2024-09-13 18:54:12 +02:00
74205607b7
Clean up Windows build ( #2562 )
...
* APR_DECLARE_STATIC and APU_DECLARE_STATIC gets already defined in APR.cmake
* Move both _CRT_SECURE_NO_WARNINGS and _WINSOCK_DEPRECATED_NO_WARNINGS definitions to 00-Common.cmake
* Always define WIN32_LEAN_AND_MEAN and include subset of Windows API by default
* Remove llwin32headerslean.h and remove unnecessary WIN32_LEAN_AND_MEAN definition handling in llwin32headers.h
* Clean up includes of Windows API headers
* Get rid of workaround to link against IPHLPAPI.lib in lluuid.cpp - this seems to have been an issue in the past that has been fixed
2024-09-13 17:28:48 +03:00
07228d3a9e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/Tracy.cmake
# indra/llappearance/llavatarappearancedefines.cpp
# indra/llcommon/llprofiler.cpp
# indra/llcommon/llprofiler.h
# indra/llfilesystem/lldiskcache.cpp
# indra/llfilesystem/lldiskcache.h
# indra/llinventory/llinventorytype.cpp
# indra/media_plugins/example/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llgroupmgr.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatarself.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/viewer_manifest.py
2024-08-15 00:12:13 +02:00
b5e306f7d8
Enable /permissive- on MSVC for better standards conformance ( #2251 )
...
* Enable /permissive- on MSVC for better C++ conformance and fix related errors
* Clean up left over warning suppressions from old library or msvc versions
2024-08-14 08:01:02 -07:00
f982463488
Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf packages ( #2250 )
...
Rebuild expat, apr, meshoptimizer, ogg_vorbis, libjpeg-turbo for symbol fixes
2024-08-12 07:30:42 +03:00
02680c6a8f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llxml/llxmltree.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroup.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/viewer_manifest.py
2024-07-30 12:32:41 +02:00
cde858a65f
Fix lltest failure by outputting to the sharedlibs dir like other tests on windows
2024-07-29 08:20:32 +03:00
e17c906698
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
b0e249d5ae
Enable SSE2 instruction support in glm for optimized codegen ( #2066 )
2024-07-19 14:00:38 +03:00
684bc1d1ea
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-06-21 19:46:51 +02:00
863c541ce0
Fix whitespace for pre-commit hooks
2024-06-18 11:57:11 -07:00
d0dfffe659
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
2024-06-17 16:02:57 -07:00
f4eae44067
Fix for warnings/errors after Visual Studio update ( #1775 )
2024-06-14 13:47:19 -05:00
8565041c2d
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
2024-06-12 11:38:14 +02:00
ed34782283
Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-11 18:43:34 -07:00
eaa04bddeb
Attempted workaround for actions/runner-images#10004 build failures.
2024-06-10 11:52:04 -07:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
24379eb3ee
disable unused but set warnings on newer compilers on mac.
2024-02-08 18:34:01 -08:00
22e724b29d
unknown warnings for TC build machines
2024-02-08 18:34:00 -08:00
8fa09570ec
Updates to build on mac.
2024-02-08 18:34:00 -08:00
39a6735fc9
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/cmake/APR.cmake
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/viewer_manifest.py
# indra/test/namedtempfile.h
2023-10-26 15:49:12 +02:00
673b3309dd
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-10-25 16:12:13 -07:00
b8e6777439
SL-18837: Merge branch 'main' into actions
2023-09-07 11:15:56 -04:00
5dd820c22d
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
2023-07-29 14:35:11 +02:00
ae63ed51aa
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 ( #292 )
2023-07-18 14:38:18 -07:00
71e7c7c705
Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 ( #232 )
2023-07-18 12:00:01 +03:00
317d4f7b0e
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/installers/windows/installer_template.nsi
2023-07-04 14:48:18 +02:00
178fc5cbaa
Fixes for compatibility with new xcode 15 beta for any viewer branch after DRTVWR-577 ( #232 )
2023-06-07 16:16:06 -07:00
19e9e8cf41
SL-18837: Try to silence cascade of Boost.Bind warning messages.
2023-06-05 12:32:10 -04:00
a0cdaa75a9
SL-18839: Add basic Github build
2023-04-10 16:17:51 -07:00
6926368ff8
SL-18839: Add basic Github build
2023-04-05 15:44:24 -07: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
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
ca53f265b4
Bump Teamcity for new Project Viewer build of DRTVWR-559
2022-10-25 14:28:35 -07:00
efb987f595
Run on windows-2022-large
2022-10-12 12:59:12 -07: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
Beq