summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.cpp')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index e35f4ae0b7..b5f1df5507 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.
-#include "openjpeg.h"
-#include "event.h"
-#include "cio.h"
+#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