Commit Graph

37 Commits (d63cb2052f99a257d9f7a8a21f1c41284ae118b5)

Author SHA1 Message Date
Rye d63cb2052f 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-11-19 11:05:41 +10:00
Rye b6ba43bed5 Initial VHACD based llconvexdecomposition 2025-11-19 10:47:34 +10:00
Hecklezz 54212f1b6c More fixes for Havok_TPV to try compile on macOS with universal build 2025-11-18 20:10:20 +10:00
Hecklezz b4bef3964b Corrected ndPhysicsStub usage check for macOS 2025-11-18 13:18:39 +10:00
Hecklezz a9c9522189 Fixed cmake argument mismatch warning 2025-11-18 13:06:45 +10:00
Hecklezz fc7a909b8d Further attempted fixes for building with Havok_TPV on macOS 2025-11-18 12:59:01 +10:00
Hecklezz 6e04de3c14 Fix PhysicsExtensions cmake for Linux 2025-11-18 00:36:21 +10:00
Hecklezz b542e69fe7 Fixed CMake files to work with MacOS universal libraries 2025-10-17 15:25:28 +10:00
Hecklezz 27fe962a3a Merge remote-tracking branch 'upstream/release/2025.07' 2025-10-17 15:20:58 +10:00
Brad Linden 589498fece Reenable havok llphysicsextensions on Darwin x86_64 with llphysicsextensions_stub used for aarch64 2025-10-01 18:01:19 -07:00
Andrey Lihatskiy 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
Ansariel 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
Nicky Dasmijn 68c680599b Try to make sure this also works with the havok version of llphysicsextension. 2022-09-17 11:21:06 +02:00
Nicky 363f2df4fa Remove function create_target and instead directly use add_library 2022-04-17 18:28:55 +02:00
Nicky e0cf0cdfd4 Switch to target_include_directories
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
Nicky 6d0bba9c03 Switch over to standard target_link_libraries (cmake requirements are high enough now). 2022-04-17 17:32:14 +02:00
Nicky 241919e7f7 Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1.
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
Ansariel 82846a5f14 Use llphysicsextensions_tpv as prebuilt name for Havok lib to avoid Autobuild failing the already installed check 2018-01-22 11:51:21 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky ed51a17f73 Current Havok stub. 2015-05-11 19:49:08 +02:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Oz Linden 12b1ec6264 refactor to build llphysicsextensions_tpv package for sublicensees 2012-07-20 07:38:12 -07:00
Oz Linden 702e6815ed partial changes for building with the llphysicsextensions source package 2012-07-05 12:16:48 -04:00
Oz Linden 21ee5f8d41 successful build with llphysicsextensions stub 2012-07-05 09:39:21 -04:00
Oz Linden 14f754f160 begin integrating building of llphysicsextensions from source here (incomplete) 2012-07-05 06:08:34 -04:00
Nicky 9cce0415c2 Add package/lib to link directories when building with tpv havok. 2012-09-03 21:51:39 +02:00
Tank_Master d9c7b9253d merge LL 3.4.0 viewer-beta 2012-08-31 00:18:30 -07:00
Nicky b95b4a33bd Enable ndPhysicsstub so we get mesh upload again. 2012-08-08 20:17:03 +02:00
Nyx (Neal Orman) de468db614 Automated merge with https://bitbucket.org/stinson_linden/viewer-development-havokai 2012-01-27 15:11:19 -05:00
Nyx (Neal Orman) f19a77047d PATH-192 FIX fixed last issues with convex decomp merge 2012-01-27 15:09:20 -05:00
Todd Stinson 00c8594454 PATH-181 and PATH-194: Implementing the building of the viewer with the stub library and validating that it does load/run as expected with the physics extensions disabled. 2012-01-26 15:24:25 -08:00
Todd Stinson 1c14b08456 PATH-181 and PATH-194: Starting to put back the ability to build the viewer using the stub libraries. 2012-01-26 14:06:57 -08:00
Nyx (Neal Orman) e67cc17e43 PATH-192 WIP adjusting cmake build for physics extensions 2012-01-25 19:05:37 -05:00
Nyx (Neal Orman) 7393587792 PATH-192 WIP adding convex decomp to pathing
First pass at using new llPhysicsExtensions library which
combines pathing and convex decomp.
2012-01-25 18:46:19 -05:00