From 9ad01c1823259ba5a5710289b65d629732199eaf Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 23 Dec 2023 19:42:32 +0800
Subject: Rely on prebuilt OpenJPEG headers

so we follow its encapsulating directory naming.
Looks like we're still going to be using LL's 3p-openjpeg for a while
more.
---
 indra/llimagej2coj/llimagej2coj.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'indra/llimagej2coj')

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 6d180e233d..7c6fded9fe 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -28,15 +28,9 @@
 #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
+#include "openjpeg/openjpeg.h"
+#include "openjpeg/event.h"
+#include "openjpeg/cio.h"
 
 #define MAX_ENCODED_DISCARD_LEVELS 5
 
-- 
cgit v1.2.3