mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-10-31 16:31:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
aports/community/basisu/10_library.patch
Holger Jaekel d26532342d community/basisu: move from testing
2023-01-24 05:21:48 +01:00

565 lines
20 KiB
Diff
Executable File
Raw Blame History

From 10614ac08a7528d71edac328646bb053dcacd9a4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 20 Jun 2022 16:20:49 +0200
Subject: [PATCH] CMake: enable building and installing as a library
Patch-Source: https://github.com/BinomialLLC/basis_universal/commit/10614ac08a7528d71edac328646bb053dcacd9a4
---
CMakeLists.txt | 155 +++++++++++++++++++++--------
cmake/Config.cmake.in | 5 +
cmake/FindZSTD.cmake | 95 ++++++++++++++++++
encoder/basisu_backend.h | 4 +-
encoder/basisu_basis_file.h | 2 +-
encoder/basisu_bc7enc.h | 2 +-
encoder/basisu_comp.cpp | 2 +-
encoder/basisu_comp.h | 2 +-
encoder/basisu_enc.h | 4 +-
encoder/basisu_etc.h | 2 +-
encoder/basisu_frontend.h | 4 +-
encoder/basisu_gpu_texture.h | 2 +-
encoder/basisu_opencl.h | 2 +-
encoder/basisu_resampler.h | 2 +-
encoder/basisu_resampler_filters.h | 2 +-
encoder/basisu_uastc_enc.h | 2 +-
transcoder/basisu_transcoder.cpp | 2 +-
17 files changed, 232 insertions(+), 57 deletions(-)
create mode 100644 cmake/Config.cmake.in
create mode 100644 cmake/FindZSTD.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 492233ae..d4e2a6a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,26 @@
-project(basisu)
+cmake_minimum_required(VERSION 3.9...3.22 FATAL_ERROR)
+
+project(basisu
+ VERSION 1.16.3
+ LANGUAGES C CXX)
+
+if (NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
-cmake_minimum_required(VERSION 3.0)
-option(STATIC "static linking" FALSE)
option(SAN "sanitize" FALSE)
+option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
+
+option(BUILD_APPS "Build the tool" ON)
+
+# GNU filesystem conventions
+include(GNUInstallDirs)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# Windows build shared libraries
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
# For MSVC builds default to SSE enabled, and determine if it's a 64-bit (-A x64) vs. 32-bit (-A Win32) build.
if (MSVC)
@@ -72,8 +90,7 @@ if (NOT MSVC)
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined")
endif()
- set(CMAKE_CXX_FLAGS -std=c++11)
- set(GCC_COMPILE_FLAGS "-fvisibility=hidden -fPIC -fno-strict-aliasing -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-local-typedefs -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable")
+ set(GCC_COMPILE_FLAGS "-fPIC -fno-strict-aliasing -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -Wno-unused-local-typedefs -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable")
if (NOT BUILD_X64)
set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -m32")
@@ -84,16 +101,6 @@ if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -DBASISU_SUPPORT_SSE=0")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS}")
- elseif (STATIC)
- if (SSE)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
- else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
- endif()
-
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -static-libgcc -static-libstdc++ -static")
else()
if (SSE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
@@ -103,7 +110,7 @@ if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
endif()
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -Wl,-rpath .")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS}")
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COMPILE_FLAGS}")
@@ -124,7 +131,6 @@ else()
endif()
set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
- basisu_tool.cpp
encoder/basisu_backend.cpp
encoder/basisu_basis_file.cpp
encoder/basisu_comp.cpp
@@ -145,24 +151,30 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST}
transcoder/basisu_transcoder.cpp
)
-if (ZSTD)
- set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c)
-endif()
+set(BASISU_LIB_TARGET "basisu_lib")
+add_library(${BASISU_LIB_TARGET} ${BASISU_SRC_LIST})
+set_target_properties(${BASISU_LIB_TARGET} PROPERTIES OUTPUT_NAME "basisu")
+target_include_directories(${BASISU_LIB_TARGET} PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/transcoder>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/encoder>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-if (APPLE)
- set(BIN_DIRECTORY "bin_osx")
-else()
- set(BIN_DIRECTORY "bin")
+if (ZSTD)
+ option(USE_EXTERNAL_ZSTD "Use external ZSTD library when found" ON)
+ find_package(ZSTD)
+ if (ZSTD_FOUND AND USE_EXTERNAL_ZSTD)
+ message("Using external ZSTD library")
+ target_link_libraries(${BASISU_LIB_TARGET} PRIVATE ZSTD::zstd)
+ else()
+ target_sources(${BASISU_LIB_TARGET} PRIVATE zstd/zstd.c)
+ target_include_directories(${BASISU_LIB_TARGET} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/zstd")
+ endif()
endif()
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${BIN_DIRECTORY})
-
-add_executable(basisu ${BASISU_SRC_LIST})
-
if (ZSTD)
- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
+ target_compile_definitions(${BASISU_LIB_TARGET} PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
else()
- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
+ target_compile_definitions(${BASISU_LIB_TARGET} PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
endif()
if (NOT MSVC)
@@ -171,8 +183,8 @@ if (NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
- target_include_directories( basisu PRIVATE ${OpenCL_INCLUDE_DIRS} )
- set(BASISU_EXTRA_LIBS ${OpenCL_LIBRARIES})
+ target_include_directories( ${BASISU_LIB_TARGET} PRIVATE ${OpenCL_INCLUDE_DIRS} )
+ target_link_libraries(${BASISU_LIB_TARGET} PRIVATE ${OpenCL_LIBRARIES})
endif()
else()
@@ -181,30 +193,93 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
- target_include_directories( basisu PRIVATE "OpenCL" )
+ target_include_directories( ${BASISU_LIB_TARGET} PRIVATE "OpenCL" )
if ( BUILD_X64 )
- target_link_libraries( basisu PRIVATE "OpenCL/lib/OpenCL64" )
+ target_link_libraries( ${BASISU_LIB_TARGET} PRIVATE "OpenCL/lib/OpenCL64" )
else()
- target_link_libraries( basisu PRIVATE "OpenCL/lib/OpenCL" )
+ target_link_libraries( ${BASISU_LIB_TARGET} PRIVATE "OpenCL/lib/OpenCL" )
endif()
endif()
endif()
if (NOT MSVC)
- target_link_libraries(basisu m pthread ${BASISU_EXTRA_LIBS})
+ include(CheckLibraryExists)
+ check_library_exists(m sin "" HAVE_LIB_M)
+ if (HAVE_LIB_M)
+ target_link_libraries(${BASISU_LIB_TARGET} PRIVATE m)
+ endif (HAVE_LIB_M)
+
+ find_package(Threads REQUIRED)
+ target_link_libraries(${BASISU_LIB_TARGET} PRIVATE Threads::Threads)
+endif()
+
+option(INSTALL_LIB "Whether to install the library and its include files" ON)
+if (INSTALL_LIB )
+
+ file(GLOB BASISU_LIB_ENCODER_PUBLIC_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "encoder/basisu*.h*")
+ file(GLOB BASISU_LIB_TRANSCODER_PUBLIC_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "transcoder/basisu*.h*")
+ set_target_properties(${BASISU_LIB_TARGET} PROPERTIES PUBLIC_HEADER
+ "${BASISU_LIB_ENCODER_PUBLIC_HEADERS};${BASISU_LIB_TRANSCODER_PUBLIC_HEADERS}")
+
+ include(CMakePackageConfigHelpers)
+
+ install(TARGETS ${BASISU_LIB_TARGET}
+ EXPORT basisu_lib_export
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/basisu")
+
+ set(namespace "basisu")
+ set(install_cmake_config "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+ install(EXPORT basisu_lib_export
+ FILE "${PROJECT_NAME}Targets.cmake"
+ NAMESPACE ${namespace}::
+ DESTINATION "${install_cmake_config}"
+ )
+
+ # generate the version file for the config file
+ write_basic_package_version_file(
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION "${version}"
+ COMPATIBILITY ExactVersion
+ )
+
+ # create config file
+ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ INSTALL_DESTINATION "${install_cmake_config}"
+ )
+
+ # install config files
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+ DESTINATION "${install_cmake_config}"
+ )
+
+ # generate the export targets for the build tree
+ export(EXPORT basisu_lib_export
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Targets.cmake"
+ NAMESPACE ${namespace}::
+ )
+endif()
+
+if (BUILD_APPS)
+ set(BASISU_TOOL_TARGET "basisu")
+ add_executable(${BASISU_TOOL_TARGET} basisu_tool.cpp)
+ target_link_libraries(${BASISU_TOOL_TARGET} PRIVATE ${BASISU_LIB_TARGET})
endif()
-if (NOT EMSCRIPTEN)
- install(TARGETS basisu DESTINATION bin)
+if (BUILD_APPS AND NOT EMSCRIPTEN)
+ install(TARGETS ${BASISU_TOOL_TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
if (UNIX)
if (CMAKE_BUILD_TYPE STREQUAL Release)
if (APPLE)
- add_custom_command(TARGET basisu POST_BUILD COMMAND strip -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu)
+ add_custom_command(TARGET ${BASISU_TOOL_TARGET} POST_BUILD COMMAND strip -X -x $<TARGET_FILE:${BASISU_TOOL_TARGET}>)
else()
- add_custom_command(TARGET basisu POST_BUILD COMMAND strip -g -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu)
+ add_custom_command(TARGET ${BASISU_TOOL_TARGET} POST_BUILD COMMAND strip -g -X -x $<TARGET_FILE:${BASISU_TOOL_TARGET}>)
endif()
endif()
endif()
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
new file mode 100644
index 00000000..8c9ad12a
--- /dev/null
+++ b/cmake/Config.cmake.in
@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+
+check_required_components(@PROJECT_NAME@)
diff --git a/cmake/FindZSTD.cmake b/cmake/FindZSTD.cmake
new file mode 100644
index 00000000..1adf451d
--- /dev/null
+++ b/cmake/FindZSTD.cmake
@@ -0,0 +1,95 @@
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying file COPYING-CMAKE-SCRIPTS or
+# https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindZSTD
+--------
+
+Find the ZSTD library
+
+Zstandard C/C++ library is built with CMake. So this find module
+should be removed when ZStandard library export cmake config files
+as distribution. Unfortunately ZStandard does not export it,
+we need to prepare find module.
+see. https://gitlab.kitware.com/cmake/cmake/-/issues/19405
+
+IMPORTED targets
+^^^^^^^^^^^^^^^^
+
+This module defines the following :prop_tgt:`IMPORTED` target: ``ZSTD::zstd``
+
+Result variables
+^^^^^^^^^^^^^^^^
+
+This module will set the following variables if found:
+
+``ZSTD_INCLUDE_DIRS`` - where to find zstd.h, etc.
+``ZSTD_LIBRARIES`` - the libraries to link against to use ZSTD.
+``ZSTD_VERSION`` - version of the ZSTD library found
+``ZSTD_FOUND`` - TRUE if found
+
+::
+
+ ``ZSTD_VERSION_MAJOR`` - The major version of zstd
+ ``ZSTD_VERSION_MINOR`` - The minor version of zstd
+ ``ZSTD_VERSION_RELEASE`` - The release version of zstd
+
+#]=======================================================================]
+
+find_package(PkgConfig)
+pkg_check_modules(PC_ZSTD QUIET libzstd)
+
+find_path(
+ ZSTD_INCLUDE_DIR
+ NAMES zstd.h
+ PATHS ${PC_ZSTD_INCLUDE_DIRS}
+)
+find_library(
+ ZSTD_LIBRARY
+ NAMES zstd zstd_static NAMES_PER_DIR
+ PATHS ${PC_ZSTD_LIBRARY_DIRS}
+)
+
+# Extract version information from the header file
+if(EXISTS "${ZSTD_INCLUDE_DIR}/zstd.h")
+ file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h"
+ _ZSTD_VERSION_MAJOR REGEX "^#define ZSTD_VERSION_MAJOR")
+ string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR ${_ZSTD_VERSION_MAJOR})
+ file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h"
+ _ZSTD_VERSION_MINOR REGEX "^#define ZSTD_VERSION_MINOR")
+ string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR ${_ZSTD_VERSION_MINOR} )
+ file(STRINGS "${ZSTD_INCLUDE_DIR}/zstd.h"
+ _ZSTD_VERSION_RELEASE REGEX "^#define ZSTD_VERSION_RELEASE")
+ string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE ${_ZSTD_VERSION_RELEASE} )
+ set(ZSTD_VERSION ${ZSTD_VERSION_MAJOR}.${ZSTD_VERSION_MINOR}.${ZSTD_VERSION_RELEASE})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+ ZSTD
+ FOUND_VAR ZSTD_FOUND
+ REQUIRED_VARS ZSTD_LIBRARY ZSTD_INCLUDE_DIR
+ VERSION_VAR ZSTD_VERSION
+ HANDLE_COMPONENTS)
+mark_as_advanced(ZSTD_INCLUDE_DIR ZSTD_LIBRARY)
+
+include(FeatureSummary)
+set_package_properties(
+ ZSTD PROPERTIES
+ DESCRIPTION "Zstandard - Fast real-time compression algorithm"
+ URL "https://github.com/facebook/zstd")
+
+if(ZSTD_FOUND)
+ set(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR})
+ set(ZSTD_LIBRARIES ${ZSTD_LIBRARY})
+ set(ZSTD_DEFINITIONS ${PC_ZSTD_CFLAGS_OTHER})
+ set(ZSTD_TARGET ZSTD::zstd)
+ if(NOT TARGET ${ZSTD_TARGET})
+ add_library(${ZSTD_TARGET} UNKNOWN IMPORTED)
+ set_target_properties(${ZSTD_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
+ if(EXISTS "${ZSTD_LIBRARY}")
+ set_target_properties(${ZSTD_TARGET} PROPERTIES IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+ IMPORTED_LOCATION "${ZSTD_LIBRARY}")
+ endif()
+ endif()
+endif()
diff --git a/encoder/basisu_backend.h b/encoder/basisu_backend.h
index 07778aeb..4e29fadc 100644
--- a/encoder/basisu_backend.h
+++ b/encoder/basisu_backend.h
@@ -14,9 +14,9 @@
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
#include "basisu_enc.h"
-#include "../transcoder/basisu_transcoder_internal.h"
+#include "basisu_transcoder_internal.h"
#include "basisu_frontend.h"
namespace basisu
diff --git a/encoder/basisu_basis_file.h b/encoder/basisu_basis_file.h
index 98498a01..3b52863f 100644
--- a/encoder/basisu_basis_file.h
+++ b/encoder/basisu_basis_file.h
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu_file_headers.h"
+#include "basisu_file_headers.h"
#include "basisu_backend.h"
namespace basisu
diff --git a/encoder/basisu_bc7enc.h b/encoder/basisu_bc7enc.h
index 8d8b7888..257f7680 100644
--- a/encoder/basisu_bc7enc.h
+++ b/encoder/basisu_bc7enc.h
@@ -14,7 +14,7 @@
// limitations under the License.
#pragma once
#include "basisu_enc.h"
-#include "../transcoder/basisu_transcoder_uastc.h"
+#include "basisu_transcoder_uastc.h"
namespace basisu
{
diff --git a/encoder/basisu_comp.cpp b/encoder/basisu_comp.cpp
index 166a1c4f..6cb8272b 100644
--- a/encoder/basisu_comp.cpp
+++ b/encoder/basisu_comp.cpp
@@ -28,7 +28,7 @@
#endif
#if BASISD_SUPPORT_KTX2_ZSTD
-#include "../zstd/zstd.h"
+#include "zstd.h"
#endif
// Set to 1 to disable the mipPadding alignment workaround (which only seems to be needed when no key-values are written at all)
diff --git a/encoder/basisu_comp.h b/encoder/basisu_comp.h
index aa5ea6fe..5d46e3fe 100644
--- a/encoder/basisu_comp.h
+++ b/encoder/basisu_comp.h
@@ -16,7 +16,7 @@
#include "basisu_frontend.h"
#include "basisu_backend.h"
#include "basisu_basis_file.h"
-#include "../transcoder/basisu_transcoder.h"
+#include "basisu_transcoder.h"
#include "basisu_uastc_enc.h"
#define BASISU_LIB_VERSION 116
diff --git a/encoder/basisu_enc.h b/encoder/basisu_enc.h
index 0efeaa46..19143a58 100644
--- a/encoder/basisu_enc.h
+++ b/encoder/basisu_enc.h
@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
-#include "../transcoder/basisu_transcoder_internal.h"
+#include "basisu.h"
+#include "basisu_transcoder_internal.h"
#include <mutex>
#include <atomic>
diff --git a/encoder/basisu_etc.h b/encoder/basisu_etc.h
index 208f2aac..a276051a 100644
--- a/encoder/basisu_etc.h
+++ b/encoder/basisu_etc.h
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
#include "basisu_enc.h"
namespace basisu
diff --git a/encoder/basisu_frontend.h b/encoder/basisu_frontend.h
index cda73f39..7106eb87 100644
--- a/encoder/basisu_frontend.h
+++ b/encoder/basisu_frontend.h
@@ -16,8 +16,8 @@
#include "basisu_enc.h"
#include "basisu_etc.h"
#include "basisu_gpu_texture.h"
-#include "../transcoder/basisu_file_headers.h"
-#include "../transcoder/basisu_transcoder.h"
+#include "basisu_file_headers.h"
+#include "basisu_transcoder.h"
namespace basisu
{
diff --git a/encoder/basisu_gpu_texture.h b/encoder/basisu_gpu_texture.h
index 619926f5..f2462a8f 100644
--- a/encoder/basisu_gpu_texture.h
+++ b/encoder/basisu_gpu_texture.h
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
#include "basisu_etc.h"
namespace basisu
diff --git a/encoder/basisu_opencl.h b/encoder/basisu_opencl.h
index 4194a084..b55ed26a 100644
--- a/encoder/basisu_opencl.h
+++ b/encoder/basisu_opencl.h
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
#include "basisu_enc.h"
#include "basisu_etc.h"
diff --git a/encoder/basisu_resampler.h b/encoder/basisu_resampler.h
index dc0978ca..a5f5b088 100644
--- a/encoder/basisu_resampler.h
+++ b/encoder/basisu_resampler.h
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
#define BASISU_RESAMPLER_DEBUG_OPS (0)
#define BASISU_RESAMPLER_DEFAULT_FILTER "lanczos4"
diff --git a/encoder/basisu_resampler_filters.h b/encoder/basisu_resampler_filters.h
index 0ebb51c3..c3300b4a 100644
--- a/encoder/basisu_resampler_filters.h
+++ b/encoder/basisu_resampler_filters.h
@@ -14,7 +14,7 @@
// limitations under the License.
#pragma once
-#include "../transcoder/basisu.h"
+#include "basisu.h"
namespace basisu
{
diff --git a/encoder/basisu_uastc_enc.h b/encoder/basisu_uastc_enc.h
index ba39a558..6ff63299 100644
--- a/encoder/basisu_uastc_enc.h
+++ b/encoder/basisu_uastc_enc.h
@@ -15,7 +15,7 @@
#pragma once
#include "basisu_etc.h"
-#include "../transcoder/basisu_transcoder_uastc.h"
+#include "basisu_transcoder_uastc.h"
namespace basisu
{
diff --git a/transcoder/basisu_transcoder.cpp b/transcoder/basisu_transcoder.cpp
index 3aeba0ee..ac49b5df 100644
--- a/transcoder/basisu_transcoder.cpp
+++ b/transcoder/basisu_transcoder.cpp
@@ -155,7 +155,7 @@
// If BASISD_SUPPORT_KTX2_ZSTD is 0, UASTC files compressed with Zstd cannot be loaded.
#if BASISD_SUPPORT_KTX2_ZSTD
// We only use two Zstd API's: ZSTD_decompress() and ZSTD_isError()
- #include "../zstd/zstd.h"
+ #include "zstd.h"
#endif
#endif
Reference in New Issue View Git Blame Copy Permalink