8a55580fc9
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llvoicewebrtc.cpp
2025-11-17 23:26:11 +01:00
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
4020c120b7
Include GLIB include directories for GStreamer.
2025-11-17 16:27:52 +00:00
2dfaf4c7b1
restore PCRE for Linux builds
...
restores previous fix that was lost due to missing FS tags
2025-11-17 15:38:54 +00:00
6e04de3c14
Fix PhysicsExtensions cmake for Linux
2025-11-18 00:36:21 +10:00
9d7a42f67f
Fix KDU cmake for Linux
2025-11-17 23:32:14 +10:00
cd8d47c9f3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-11-12 18:44:30 +01:00
05658cbff1
Fix support for MSVC toolset v145(VS2026)
...
Signed-off-by: Rye <rye@alchemyviewer.org>
2025-11-12 15:54:36 +01:00
4a7f5b6709
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/cmake/APR.cmake
2025-10-22 13:52:23 +02:00
0e59ef1112
Updated APR library and removed hotfix patch in APR cmake
2025-10-22 19:20:04 +10:00
431b3b0c6d
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/pre-commit.yaml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llwindow/llopenglview-objc.mm
# indra/newview/CMakeLists.txt
# indra/newview/llappdelegate-objc.mm
2025-10-20 23:56:48 +02:00
1a58d3e023
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
...
# Conflicts:
# indra/cmake/APR.cmake
2025-10-20 23:16:15 +02:00
41e9595522
Rework new convex decomp into a physicsextensions stub package and fix havok and havok_tpv builds for darwin universal to utilize new vhacd stub ( #4858 )
2025-10-20 13:10:19 -04:00
77746a648f
Prevent full rebuild each time CMake detects any changes
2025-10-20 11:27:00 +02:00
5c03f284af
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/APR.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/newview/llsurface.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
2025-10-18 13:01:08 +02:00
9c9f555ae3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
2025-10-18 12:44:12 +02:00
36217e7cb3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llwebrtc/llwebrtc.cpp
# indra/llwebrtc/llwebrtc_impl.h
# indra/newview/llvoicewebrtc.cpp
# indra/newview/llvoicewebrtc.h
2025-10-18 12:33:24 +02:00
bbc2ad8fc5
Merge remote-tracking branch 'origin/main' into geenz/main-to-develop
2025-10-17 17:06:39 -04:00
b542e69fe7
Fixed CMake files to work with MacOS universal libraries
2025-10-17 15:25:28 +10:00
27fe962a3a
Merge remote-tracking branch 'upstream/release/2025.07'
2025-10-17 15:20:58 +10:00
06e8393846
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-10-16 22:48:43 +02:00
790c52f3fd
Fix erroneous check for __attribute__ definition introduced with APR 1.7.5
...
With the update of APR to versoin 1.7.5., we have to deal with an erroneous check for the definition of __attribute__ added to the APR head file apr.h: The additional check for the definition of __has_attribute is nonsense as it is a C++ internal macro to check for the existance of certain attributes, however it has nothing to do with __attribute__ used in this context.
Since __attribute__ is not defined in MSVC, the modified, erroneous check now causes said definition becoming missing, resulting in a huge amount of "this declaration may not have extern 'C' linkage" errors within in MSVC.
This change utilizes CMake to patch the extracted APR header file, restoring the original version of the check.
2025-10-16 19:44:18 +03:00
08fc848653
Reverted part of Linking.cmake update for WebRTC until 2025.07 is merged
2025-10-16 14:39:47 +10:00
14e3561f67
Updated Linking.cmake to fix compilation issues with the updated WebRTC
2025-10-14 16:04:14 +10:00
5fb339d033
Updated WebRTC.cmake to fix compilation issues with the updated WebRTC
2025-10-13 14:32:26 +10:00
e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
b277cc6a8f
Initial VHACD based llconvexdecomposition
2025-10-03 09:51:03 -04:00
589498fece
Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64
2025-10-01 18:01:19 -07: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
f98a61be70
Improvements found in reviewing mac_arm branch #4629
2025-09-10 13:04:04 -07:00
710cbf564d
More unused-but-set fixes. Also remove Linux exclusion
...
Linux was suppressing these issues rather than fixing them.
2025-09-08 21:45:25 +01:00
9849da1a3e
Hotfix incorrect check in apr.h on the fly, causing tons of external C linkage errors showing up in VS
2025-09-06 15:23:14 +02:00
255b5c6381
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/LLKDU.cmake
# indra/newview/CMakeLists.txt
2025-09-06 12:03:58 +02:00
8f43b5b77b
Fix macos build arch and deploy target due to cmake behavior changes
2025-09-05 19:35:22 -04:00
12704b9411
viewer-cef build fixes
2025-09-05 19:00:05 +03: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
5ffcd3dc88
Fixes for GHA build
2025-08-28 17:58:33 -04:00
77d71dec86
Fix up universal build
2025-08-28 00:43:38 -04:00
34ae3db498
Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac
2025-08-27 23:07:22 -04:00
536c821c09
MacOS companion changes for dullahan 1.21 including package structure and linkage fixes
2025-08-27 23:05:40 -04:00
a46d4f0f69
Enable deprecation warnings and suppress a small handful that have no modern replacements
2025-08-22 03:32:02 -04:00
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
99238dd031
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-16 23:32:53 +02:00
2e38bd092d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2025-08-16 13:45:36 +02:00
6f21013d89
Fix long standing build issue due to bug in build variables
2025-08-16 13:38:27 +02:00
2034100049
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Discord.cmake
# indra/newview/CMakeLists.txt
# indra/newview/llfloaterpreference.cpp
# indra/newview/viewer_manifest.py
2025-08-05 17:50:50 +02:00
c267497509
#4470 Adjustments and Mac build fixes
2025-08-05 18:26:29 +03:00
61d53a8731
#4470 Plug in Discord SDK package
2025-08-05 18:26:29 +03:00
debb86fb57
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/cmake/Discord.cmake
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llspeakers.cpp
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2025-08-01 00:03:48 +02:00
Ansariel