From 5dddf739f6eae3de351eeb7e5a83ddcc68b31b54 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Wed, 12 Jul 2023 15:20:01 +0800
Subject: System OpenJPEG headers are encapsulated

For now the directory name is hardcoded since v2.5.0 is the latest and the viewer code already depends on a certain function from that version. So for now it's safe to assume that the directory name's suffix is 2.5.
---
 indra/llimagej2coj/llimagej2coj.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 12985c3c7f..a15164858a 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.
+#ifdef LL_USESYSTEMLIBS
+#include <openjpeg-2.5/openjpeg.h>
+#include <openjpeg-2.5/event.h>
+#include <openjpeg-2.5/cio.h>
+#else
 #include "openjpeg.h"
 #include "event.h"
 #include "cio.h"
+#endif
 
 #define MAX_ENCODED_DISCARD_LEVELS 5
 
-- 
cgit v1.2.3