livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer-cef build fixes

master
Andrey Kleshchev 2025-09-05 13:23:09 +03:00 committed by Andrey Kleshchev
parent 94e45ca2e6
commit 12704b9411
4 changed files with 114 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/CMakeLists.txt
View File

@ -11,8 +11,12 @@
## We're not there yet, but once done, there is a kludge in Linking.cmake ## We're not there yet, but once done, there is a kludge in Linking.cmake
# "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed # "if(${CMAKE_VERSION} VERSION_LESS "3.20.0")" that can also be removed
cmake_minimum_required(VERSION 3.16.0...4.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.16.0...4.0 FATAL_ERROR)
cmake_policy(SET CMP0156 NEW) if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.29.0")
cmake_policy(SET CMP0179 NEW) cmake_policy(SET CMP0156 NEW)
endif()
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.31.0")
cmake_policy(SET CMP0179 NEW)
endif()
set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING
"The root project/makefile/solution name. Defaults to SecondLife.") "The root project/makefile/solution name. Defaults to SecondLife.")

134
indra/cmake/Boost.cmake
View File

@ -16,53 +16,107 @@ use_prebuilt_binary(boost)
# with the address size. # with the address size.
set(addrsfx "-x${ADDRESS_SIZE}") set(addrsfx "-x${ADDRESS_SIZE}")
find_library(BOOST_CONTEXT_LIBRARY if (WINDOWS)
NAMES
boost_context-mt
boost_context-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_FIBER_LIBRARY find_library(BOOST_CONTEXT_LIBRARY
NAMES NAMES
boost_fiber-mt libboost_context-mt
boost_fiber-mt${addrsfx} libboost_context-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_FILESYSTEM_LIBRARY find_library(BOOST_FIBER_LIBRARY
NAMES NAMES
boost_filesystem-mt libboost_fiber-mt
boost_filesystem-mt${addrsfx} libboost_fiber-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_PROGRAMOPTIONS_LIBRARY find_library(BOOST_FILESYSTEM_LIBRARY
NAMES NAMES
boost_program_options-mt libboost_filesystem-mt
boost_program_options-mt${addrsfx} libboost_filesystem-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_REGEX_LIBRARY find_library(BOOST_PROGRAMOPTIONS_LIBRARY
NAMES NAMES
boost_regex-mt libboost_program_options-mt
boost_regex-mt${addrsfx} libboost_program_options-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_SYSTEM_LIBRARY find_library(BOOST_REGEX_LIBRARY
NAMES NAMES
boost_system-mt libboost_regex-mt
boost_system-mt${addrsfx} libboost_regex-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_THREAD_LIBRARY find_library(BOOST_SYSTEM_LIBRARY
NAMES NAMES
boost_thread-mt libboost_system-mt
boost_thread-mt${addrsfx} libboost_system-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_URL_LIBRARY find_library(BOOST_THREAD_LIBRARY
NAMES NAMES
boost_url-mt libboost_thread-mt
boost_url-mt${addrsfx} libboost_thread-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_URL_LIBRARY
NAMES
libboost_url-mt
libboost_url-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
else (WINDOWS)
find_library(BOOST_CONTEXT_LIBRARY
NAMES
boost_context-mt
boost_context-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_FIBER_LIBRARY
NAMES
boost_fiber-mt
boost_fiber-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_FILESYSTEM_LIBRARY
NAMES
boost_filesystem-mt
boost_filesystem-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_PROGRAMOPTIONS_LIBRARY
NAMES
boost_program_options-mt
boost_program_options-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_REGEX_LIBRARY
NAMES
boost_regex-mt
boost_regex-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_SYSTEM_LIBRARY
NAMES
boost_system-mt
boost_system-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_THREAD_LIBRARY
NAMES
boost_thread-mt
boost_thread-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(BOOST_URL_LIBRARY
NAMES
boost_url-mt
boost_url-mt${addrsfx}
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
endif (WINDOWS)
target_link_libraries(ll::boost INTERFACE target_link_libraries(ll::boost INTERFACE
${BOOST_FIBER_LIBRARY} ${BOOST_FIBER_LIBRARY}

17
indra/cmake/LLKDU.cmake
View File

@ -14,10 +14,19 @@ if (USE_KDU)
include(Prebuilt) include(Prebuilt)
use_prebuilt_binary(kdu) use_prebuilt_binary(kdu)
find_library(KDU_LIBRARY if (WINDOWS)
NAMES find_library(KDU_LIBRARY
kdu NAMES
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) kdu
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
else (WINDOWS)
find_library(KDU_LIBRARY
NAMES
libkdu.a
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
endif (WINDOWS)
target_link_libraries(ll::kdu INTERFACE ${KDU_LIBRARY}) target_link_libraries(ll::kdu INTERFACE ${KDU_LIBRARY})

1
indra/llkdu/tests/llimagej2ckdu_test.cpp
View File

@ -80,6 +80,7 @@ U8* LLImageBase::getData() { return NULL; }
U8* LLImageBase::reallocateData(S32 ) { return NULL; } U8* LLImageBase::reallocateData(S32 ) { return NULL; }
void LLImageBase::sanityCheck() { } void LLImageBase::sanityCheck() { }
void LLImageBase::setSize(S32 , S32 , S32 ) { } void LLImageBase::setSize(S32 , S32 , S32 ) { }
bool LLImageBase::isBufferInvalid() const { return false; }
LLImageJ2CImpl::~LLImageJ2CImpl() { } LLImageJ2CImpl::~LLImageJ2CImpl() { }