From 5dddf739f6eae3de351eeb7e5a83ddcc68b31b54 Mon Sep 17 00:00:00 2001 From: Erik Kundiman 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 +#include +#include +#else #include "openjpeg.h" #include "event.h" #include "cio.h" +#endif #define MAX_ENCODED_DISCARD_LEVELS 5 -- cgit v1.2.3 From 6e4f095baa8e33effe80b68ddf834a3b80f2bb67 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 29 Jul 2023 20:58:27 +0800 Subject: Setting BUILD_SHARED_LIBS on is now possible by removing cyclic dependencies, and allowing shlib undefined on SLPlugin alone. --- indra/llimagej2coj/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llimagej2coj') diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt index 93e85668dd..5bd4c75426 100644 --- a/indra/llimagej2coj/CMakeLists.txt +++ b/indra/llimagej2coj/CMakeLists.txt @@ -21,9 +21,10 @@ list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES}) add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES}) +include_directories( ${CMAKE_SOURCE_DIR}/llimage ) target_link_libraries( llimagej2coj llcommon - llimage + #llimage ll::openjpeg ) -- cgit v1.2.3 From 665a55a1a232877ccb499dbfd17806f438385e82 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sat, 29 Jul 2023 21:07:13 +0800 Subject: The Linden libraries can be installed now Useful when installed as shared libraries, so other viewer executables can share these libraries. --- indra/llimagej2coj/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llimagej2coj') diff --git a/indra/llimagej2coj/CMakeLists.txt b/indra/llimagej2coj/CMakeLists.txt index 5bd4c75426..5a2aac9e84 100644 --- a/indra/llimagej2coj/CMakeLists.txt +++ b/indra/llimagej2coj/CMakeLists.txt @@ -28,3 +28,4 @@ target_link_libraries( llimagej2coj ll::openjpeg ) +include(LibraryInstall) -- cgit v1.2.3