summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-09-07 18:01:01 +0800
committerErik Kundiman <erik@megapahit.org>2024-09-07 18:02:44 +0800
commit23b7628ac8bb43e1c3d33744df071b23c352f713 (patch)
treed43ef958193f8b26fa282eb6adf60a8bdc3d21a3 /indra/llprimitive
parenta742349cabd97b42e61e1b445f79840407cb3479 (diff)
parent3aacb2ec3f49d82e99af516bef4cd547f55dc3e0 (diff)
Merge branch 'main' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/CMakeLists.txt20
-rw-r--r--indra/llprimitive/lldaeloader.cpp8
2 files changed, 20 insertions, 8 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 02be121506..8d403dc6c8 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -3,6 +3,7 @@
project(llprimitive)
include(00-Common)
+include(Prebuilt)
include(LLCommon)
include(LLCoreHttp)
include(LLPhysicsExtensions)
@@ -11,6 +12,25 @@ include(GLH)
include(GLM)
include(TinyGLTF)
+if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD )
+ prepare_thirdparty(
+ "https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r7.tar.gz"
+ "colladadom-v2.3-r7.tar.gz"
+ "3p-colladadom-2.3-r7"
+ "collada-dom-v2.3-r7.patch"
+ "0d7a13531eb0de8c617b48af90c3b5b22c2a0b566069d1a0c36f9602dbfeb9ebab1516556e6dda34645d63354c3c6539375d7e5b8c0b36baba11312d18a3c705"
+ )
+ set(OPT_COLLADA14 TRUE)
+ add_subdirectory(
+ "${CMAKE_SOURCE_DIR}/../../3p-colladadom-2.3-r7" "colladadom")
+ target_include_directories(
+ ll::colladadom INTERFACE
+ ${colladadom_SOURCE_DIR}/include
+ ${colladadom_SOURCE_DIR}/include/1.4
+ )
+ target_link_libraries( ll::colladadom INTERFACE collada14dom )
+endif(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD )
+
set(llprimitive_SOURCE_FILES
lldaeloader.cpp
llgltfloader.cpp
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 544db36b50..34af3ffece 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -935,20 +935,12 @@ bool LLDAELoader::OpenFile(const std::string& filename)
domCOLLADA* dom;
if (mPreprocessDAE)
{
-#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX)
- dom = static_cast<domCOLLADA *>(dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str()));
-#else
dom = dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str());
-#endif
}
else
{
LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL;
-#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX)
- dom = static_cast<domCOLLADA *>(dae.open(uri_filename));
-#else
dom = dae.open(uri_filename);
-#endif
}
if (!dom)