diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-28 17:55:02 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-28 17:55:02 +0800 |
| commit | 641a0f760f3a44983c527e1a5ce5ecc82b028e80 (patch) | |
| tree | 4589b8e3c306fb7e2d475c1ffc014e73e81f78fd /indra/llimagej2coj | |
| parent | 5c651c1f90be1059fe059dba7bab5c69d211206e (diff) | |
BSDs use system OpenJPEG, Linuxes link statically
Cause 2.5.2 on MacPorts and FBSD ports are safe, while 2.5.0 on
Debian/Ubuntu would cause a crash that we stick to LL's 2.5.0.
Diffstat (limited to 'indra/llimagej2coj')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 26043b2d8b..67cd9d572d 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -28,9 +28,15 @@ #include "llimagej2coj.h" // this is defined so that we get static linking. +#if LL_LINUX || !LL_USESYSTEMLIBS #include "openjpeg/openjpeg.h" #include "openjpeg/event.h" #include "openjpeg/cio.h" +#else +#include <openjpeg-2.5/openjpeg.h> +#include <openjpeg-2.5/event.h> +#include <openjpeg-2.5/cio.h> +#endif #define MAX_ENCODED_DISCARD_LEVELS 5 |