diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-12 20:14:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-12 20:14:23 +0800 |
| commit | 0500c78b1bccda71a8623785c9765a7adaec0071 (patch) | |
| tree | a5616b818809f0631a9cd7bacd0f025ad4dd3f83 /indra/llui/llxuiparser.cpp | |
| parent | c996cdbe68c92313c311b9c8696ea3bd3ae69446 (diff) | |
Have unencapsulated Expat headers in any condition
The only condition where Expat headers would be encapsulated is when
using LL's Autobuild-based prebuilt libraries, and we're never using
any of LL's prebuilt binary for Expat on desktop, since Expat is
practically available on any supported desktop platform.
The system Expat headers are never encapsulated in any of those
platforms.
This is the beginning of not relying on the LL_USESYSTEMLIBS macro
any more (eventually not relying on the custom USESYSTEMLIBS CMake
setting either).
Keeping the build system still flexible to have the option to use
LL's prebuilt libraries *fully* (we still use some of them in cases
where the platform may not have the related system library or for
convenience, so the term USESYSTEMLIBS may not always be consistent),
is getting harder to maintain.
The way it's done is using #if 1, in order to minimise difference
from upstream.
Diffstat (limited to 'indra/llui/llxuiparser.cpp')
| -rw-r--r-- | indra/llui/llxuiparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 8fd85a89a1..8cd11b86b3 100644 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -30,7 +30,7 @@ #include "llxmlnode.h" #include "llfasttimer.h" -#ifdef LL_USESYSTEMLIBS +#if 1 #include <expat.h> #else #include "expat/expat.h" |