diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-12-23 19:42:32 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-12-23 19:42:32 +0800 |
| commit | 9ad01c1823259ba5a5710289b65d629732199eaf (patch) | |
| tree | e7cb9febee6abda55e9f3ed80d04c17984889a63 | |
| parent | a0e9136f1466372cd70bb2749346b2d4392b607f (diff) | |
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.
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 2 | ||||
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 83b959e140..6fa4cad9c2 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -17,4 +17,4 @@ add_library( ll::openjpeg INTERFACE IMPORTED ) #use_prebuilt_binary(openjpeg) target_link_libraries(ll::openjpeg INTERFACE openjp2 ) -target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/openjpeg) +target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) 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 |