diff --git a/modules/FindBasisUniversal.cmake b/modules/FindBasisUniversal.cmake index 72d5c7ec0..e8d6e3360 100644 --- a/modules/FindBasisUniversal.cmake +++ b/modules/FindBasisUniversal.cmake @@ -188,7 +188,11 @@ foreach(_component ${BasisUniversal_FIND_COMPONENTS}) lodepng.cpp # Added in 1.16 basisu_opencl.cpp - pvpngreader.cpp) + pvpngreader.cpp + # Added in 1.50 + basisu_astc_hdr_enc.cpp + 3rdparty/android_astc_decomp.cpp + 3rdparty/tinyexr.cpp) # Disable the find root path here, it overrides the # CMAKE_FIND_ROOT_PATH_MODE_INCLUDE setting potentially set in # toolchains. diff --git a/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp b/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp index 89d87f8a2..054ca3a26 100644 --- a/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp +++ b/src/MagnumPlugins/BasisImageConverter/BasisImageConverter.cpp @@ -274,7 +274,11 @@ template Containers::Optional> c /* If these are enabled, the library reads BMPs/JPGs/PNGs/TGAs from the filesystem and then writes basis files there also. DO NOT WANT. */ params.m_read_source_images = false; + #if BASISU_LIB_VERSION >= 150 + params.m_write_output_basis_or_ktx2_files = false; + #else params.m_write_output_basis_files = false; + #endif /* One image per slice. The base mip is in m_source_images, mip 1 and higher go into m_source_mipmap_images. */ const UnsignedInt numImages = Vector3i::pad(baseSize, 1).z();