From 6bc9ec41ddd0191748ef938909a3ed192c9e59cd Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 31 Aug 2024 07:45:27 +0800 Subject: Revert Linux/BSD to use system Collada DOM for now Turns out getting 2.3 compiled on those platforms need a lot more attention. Apart from that, the compilation result variable name got fixed, the prebuilt include directory got fixed, and pkg-config-ing minizip, libpcrecpp and libxml-2.0 so we can make have generic variable arguments to pass to Collada DOM's CMake settings. --- indra/llprimitive/lldaeloader.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/llprimitive/lldaeloader.cpp') diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 43fb043363..56bf91bc22 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -941,12 +941,20 @@ bool LLDAELoader::OpenFile(const std::string& filename) domCOLLADA* dom; if (mPreprocessDAE) { +#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX) + dom = static_cast(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(dae.open(uri_filename)); +#else dom = dae.open(uri_filename); +#endif } if (!dom) -- cgit v1.2.3