diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-31 07:45:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-31 07:50:30 +0800 |
| commit | 6bc9ec41ddd0191748ef938909a3ed192c9e59cd (patch) | |
| tree | ef4fad8f8f00ece8f25c919313d9e0fd42063448 /indra/llprimitive | |
| parent | d604302d942d26ccfd8e0e5de548fa437d1425d5 (diff) | |
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.
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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<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) |