mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: Add basis-universal.
* gnu/packages/graphics.scm (basis-universal): New variable. * gnu/packages/patches/basis-universal-unbundle-libs.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: I1a469fe7ea3255d172f6de44ced1bbf8abf57118 Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
Lilah Tascheter
宋文武
parent
c0c36654bd
commit
b87f5d35d2
3 changed files with 339 additions and 0 deletions
|
|
@ -1029,6 +1029,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/barony-fix-textures.patch \
|
%D%/packages/patches/barony-fix-textures.patch \
|
||||||
%D%/packages/patches/bash-completion-directories.patch \
|
%D%/packages/patches/bash-completion-directories.patch \
|
||||||
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
|
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
|
||||||
|
%D%/packages/patches/basis-universal-unbundle-libs.patch \
|
||||||
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
|
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
|
||||||
%D%/packages/patches/bdb-4-5-configure.patch \
|
%D%/packages/patches/bdb-4-5-configure.patch \
|
||||||
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
|
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@
|
||||||
#:use-module (gnu packages mp3)
|
#:use-module (gnu packages mp3)
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
#:use-module (gnu packages ninja)
|
#:use-module (gnu packages ninja)
|
||||||
|
#:use-module (gnu packages opencl)
|
||||||
#:use-module (gnu packages pciutils)
|
#:use-module (gnu packages pciutils)
|
||||||
#:use-module (gnu packages pdf)
|
#:use-module (gnu packages pdf)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
|
|
@ -3414,3 +3415,38 @@ environment. It supports drawing freehand as well as basic shapes and text.
|
||||||
It features cut-and-paste for irregular regions or polygons.")
|
It features cut-and-paste for irregular regions or polygons.")
|
||||||
(home-page "https://www.gnu.org/software/gpaint/")
|
(home-page "https://www.gnu.org/software/gpaint/")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public basis-universal
|
||||||
|
(package
|
||||||
|
(name "basis-universal")
|
||||||
|
(version "1.60")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/BinomialLLC/basis_universal")
|
||||||
|
(commit (string-append "v"
|
||||||
|
(string-replace-substring version "." "_")))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(patches (search-patches "basis-universal-unbundle-libs.patch"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet #~(for-each delete-file-recursively '("OpenCL" "zstd")))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1s38fp3j9pp0s260s805lw2h4gqbx7d2cd0d96pjp5bfqndmmk8b"))))
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments
|
||||||
|
(list #:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(delete 'check)
|
||||||
|
(add-after 'install 'check
|
||||||
|
(lambda _ (invoke (string-append #$output "/bin/basisu")
|
||||||
|
"-test_dir" "../source/test_files"
|
||||||
|
"-test"))))))
|
||||||
|
(inputs (list opencl-headers (list zstd "lib")))
|
||||||
|
(native-inputs (list pkg-config))
|
||||||
|
(home-page "https://github.com/BinomialLLC/basis_universal")
|
||||||
|
(synopsis "LDR/HDR compressed texture transcoder")
|
||||||
|
(description "Basis Universal is an LDR/HDR GPU compressed texture
|
||||||
|
interchange system supporting transcoding to a large number of GPU texture
|
||||||
|
formats.")
|
||||||
|
(license (list license:asl2.0 license:bsd-3 license:expat))))
|
||||||
|
|
|
||||||
302
gnu/packages/patches/basis-universal-unbundle-libs.patch
Normal file
302
gnu/packages/patches/basis-universal-unbundle-libs.patch
Normal file
|
|
@ -0,0 +1,302 @@
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index e2c7a1d..b6c860f 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -1,141 +1,13 @@
|
||||||
|
# Important: The Basis Universal encoder and transcoder libraries must be compiled with -fno-strict-aliasing (MSVC's default, and also the Linux kernel).
|
||||||
|
# It should also work without this option, but we do not test with it.
|
||||||
|
-cmake_minimum_required(VERSION 3.5)
|
||||||
|
+cmake_minimum_required(VERSION 3.31)
|
||||||
|
|
||||||
|
project(basisu)
|
||||||
|
-option(STATIC "static linking" FALSE)
|
||||||
|
-option(SAN "sanitize" FALSE)
|
||||||
|
+find_package(PkgConfig)
|
||||||
|
|
||||||
|
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
||||||
|
+add_compile_options("-fno-strict-aliasing")
|
||||||
|
+add_compile_definitions(BASISU_SUPPORT_SSE=0 BASISD_SUPPORT_KTX2_ZSTD=1 BASISU_SUPPORT_OPENCL=0)
|
||||||
|
|
||||||
|
-# 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)
|
||||||
|
- option(SSE "SSE 4.1 support" TRUE)
|
||||||
|
- if ( CMAKE_GENERATOR_PLATFORM STREQUAL Win32 )
|
||||||
|
- set(BUILD_X64 0)
|
||||||
|
- else()
|
||||||
|
- set(BUILD_X64 1)
|
||||||
|
- endif()
|
||||||
|
- add_compile_options(/W4)
|
||||||
|
-else()
|
||||||
|
- option(SSE "SSE 4.1 support" FALSE)
|
||||||
|
- option(BUILD_X64 "build 64-bit" TRUE)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-option(ZSTD "ZSTD support for KTX2 transcoding/encoding" TRUE)
|
||||||
|
-option(OPENCL "OpenCL support in encoder" FALSE)
|
||||||
|
-
|
||||||
|
-message("Initial BUILD_X64=${BUILD_X64}")
|
||||||
|
-message("Initial CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
|
||||||
|
-message("Initial SSE=${SSE}")
|
||||||
|
-message("Initial ZSTD=${ZSTD}")
|
||||||
|
-message("Initial OPENCL=${OPENCL}")
|
||||||
|
-message("Initial SAN=${SAN}")
|
||||||
|
-
|
||||||
|
-if ((NOT MSVC) AND OPENCL)
|
||||||
|
- # With MSVC builds we use the Khronos lib/include files in the project's "OpenCL" directory, to completely avoid requiring fiddly to install vendor SDK's.
|
||||||
|
- # Otherwise we use the system's (if any).
|
||||||
|
- find_package(OpenCL)
|
||||||
|
- message(STATUS "OpenCL found: ${OPENCL_FOUND}")
|
||||||
|
- message(STATUS "OpenCL includes: ${OpenCL_INCLUDE_DIRS}")
|
||||||
|
- message(STATUS "OpenCL libraries: ${OpenCL_LIBRARIES}")
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if( NOT CMAKE_BUILD_TYPE )
|
||||||
|
- set( CMAKE_BUILD_TYPE Release )
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-message(${PROJECT_NAME} " build type: " ${CMAKE_BUILD_TYPE})
|
||||||
|
-
|
||||||
|
-if (BUILD_X64)
|
||||||
|
- message("Building 64-bit")
|
||||||
|
-else()
|
||||||
|
- message("Building 32-bit")
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if (SSE)
|
||||||
|
- message("SSE enabled")
|
||||||
|
-else()
|
||||||
|
- message("SSE disabled")
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if (ZSTD)
|
||||||
|
- message("Zstandard enabled")
|
||||||
|
-else()
|
||||||
|
- message("Zstandard disabled")
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if (NOT MSVC)
|
||||||
|
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
|
||||||
|
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
|
||||||
|
-
|
||||||
|
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
|
||||||
|
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
|
||||||
|
-
|
||||||
|
- if (SAN)
|
||||||
|
- message("Enabling SAN")
|
||||||
|
-
|
||||||
|
- set(SANITIZE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize=alignment")
|
||||||
|
-
|
||||||
|
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
|
||||||
|
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
|
||||||
|
-
|
||||||
|
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
|
||||||
|
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- set(CMAKE_CXX_FLAGS -std=c++17)
|
||||||
|
- 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 -Wno-reorder -Wno-misleading-indentation -Wno-class-memaccess -Wno-deprecated-copy -Wno-maybe-uninitialized -Wno-unused-function -Wno-stringop-overflow -Wno-unknown-warning-option")
|
||||||
|
-
|
||||||
|
- if (NOT BUILD_X64)
|
||||||
|
- set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -m32")
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- if (EMSCRIPTEN)
|
||||||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -DBASISU_SUPPORT_SSE=0")
|
||||||
|
- 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")
|
||||||
|
- 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} -Wl,-rpath .")
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COMPILE_FLAGS}")
|
||||||
|
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GCC_COMPILE_FLAGS}")
|
||||||
|
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${GCC_COMPILE_FLAGS} -D_DEBUG")
|
||||||
|
-
|
||||||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
|
||||||
|
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GCC_COMPILE_FLAGS}")
|
||||||
|
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GCC_COMPILE_FLAGS} -D_DEBUG")
|
||||||
|
-else()
|
||||||
|
- if (SSE)
|
||||||
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1")
|
||||||
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=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()
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-# Define the source files for the static library
|
||||||
|
set(ENCODER_LIB_SRC_LIST
|
||||||
|
encoder/basisu_backend.cpp
|
||||||
|
encoder/basisu_basis_file.cpp
|
||||||
|
@@ -161,94 +33,26 @@ set(ENCODER_LIB_SRC_LIST
|
||||||
|
encoder/3rdparty/tinyexr.cpp
|
||||||
|
transcoder/basisu_transcoder.cpp
|
||||||
|
)
|
||||||
|
+set(ENCODER_LIB_HEADER_LIST
|
||||||
|
+ transcoder/basisu.h
|
||||||
|
+ transcoder/basisu_containers.h
|
||||||
|
+ transcoder/basisu_file_headers.h
|
||||||
|
+ transcoder/basisu_transcoder.h
|
||||||
|
+ transcoder/basisu_transcoder_internal.h
|
||||||
|
+ transcoder/basisu_transcoder_uastc.h
|
||||||
|
+)
|
||||||
|
|
||||||
|
-if (ZSTD)
|
||||||
|
- set(ENCODER_LIB_SRC_LIST ${ENCODER_LIB_SRC_LIST} zstd/zstd.c)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-# Create the static library
|
||||||
|
-add_library(basisu_encoder STATIC ${ENCODER_LIB_SRC_LIST})
|
||||||
|
-
|
||||||
|
-# Create the basisu executable and link against the static library
|
||||||
|
+add_library(basisu_encoder SHARED ${ENCODER_LIB_SRC_LIST})
|
||||||
|
add_executable(basisu basisu_tool.cpp)
|
||||||
|
target_link_libraries(basisu PRIVATE basisu_encoder)
|
||||||
|
|
||||||
|
-# Create the new example executable and link against the static library
|
||||||
|
-add_executable(examples example/example.cpp)
|
||||||
|
-target_link_libraries(examples PRIVATE basisu_encoder)
|
||||||
|
-
|
||||||
|
-if (ZSTD)
|
||||||
|
- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
|
||||||
|
- target_compile_definitions(examples PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
|
||||||
|
-else()
|
||||||
|
- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
|
||||||
|
- target_compile_definitions(examples PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if (NOT MSVC)
|
||||||
|
- # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us.
|
||||||
|
- if (OPENCL AND OPENCL_FOUND)
|
||||||
|
- 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})
|
||||||
|
- target_include_directories(examples PRIVATE ${OpenCL_INCLUDE_DIRS})
|
||||||
|
- target_include_directories(basisu_encoder PRIVATE ${OpenCL_INCLUDE_DIRS})
|
||||||
|
- set(BASISU_EXTRA_LIBS ${OpenCL_LIBRARIES})
|
||||||
|
- endif()
|
||||||
|
-else()
|
||||||
|
- # For Windows builds, we use our local copies of the OpenCL import lib and Khronos headers.
|
||||||
|
- if (OPENCL)
|
||||||
|
- 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(examples PRIVATE "OpenCL")
|
||||||
|
- target_include_directories(basisu_encoder PRIVATE "OpenCL")
|
||||||
|
-
|
||||||
|
- if (BUILD_X64)
|
||||||
|
- target_link_libraries(basisu PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL64.lib")
|
||||||
|
- target_link_libraries(examples PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL64.lib")
|
||||||
|
- else()
|
||||||
|
- target_link_libraries(basisu PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL.lib")
|
||||||
|
- target_link_libraries(examples PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL.lib")
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
-if (NOT MSVC)
|
||||||
|
- target_link_libraries(basisu PRIVATE m pthread ${BASISU_EXTRA_LIBS})
|
||||||
|
- target_link_libraries(examples PRIVATE m pthread ${BASISU_EXTRA_LIBS})
|
||||||
|
-endif()
|
||||||
|
+pkg_check_modules(ZSTD REQUIRED libzstd)
|
||||||
|
+target_include_directories(basisu_encoder SYSTEM PUBLIC ${ZSTD_INCLUDE_DIRS})
|
||||||
|
+target_link_libraries(basisu_encoder PUBLIC ${ZSTD_LINK_LIBRARIES})
|
||||||
|
|
||||||
|
-if (NOT EMSCRIPTEN)
|
||||||
|
- 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)
|
||||||
|
- #message("strip command: strip -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu")
|
||||||
|
- else()
|
||||||
|
- add_custom_command(TARGET basisu POST_BUILD COMMAND strip -g -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu)
|
||||||
|
- #message("strip command: strip -g -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu")
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
-endif()
|
||||||
|
+include(GNUInstallDirs)
|
||||||
|
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/basisu_encoder.pc.in ${CMAKE_CURRENT_BINARY_DIR}/basisu_encoder.pc @ONLY)
|
||||||
|
|
||||||
|
-if (MSVC)
|
||||||
|
- set_target_properties(basisu PROPERTIES
|
||||||
|
- RUNTIME_OUTPUT_NAME "basisu"
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- set_target_properties(examples PROPERTIES
|
||||||
|
- RUNTIME_OUTPUT_NAME "examples"
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
|
||||||
|
- )
|
||||||
|
-endif()
|
||||||
|
+install(TARGETS basisu basisu_encoder)
|
||||||
|
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/basisu_encoder.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||||
|
+install(FILES ${ENCODER_LIB_HEADER_LIST} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||||
|
diff --git a/basisu_encoder.pc.in b/basisu_encoder.pc.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..0ba05a1
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/basisu_encoder.pc.in
|
||||||
|
@@ -0,0 +1,8 @@
|
||||||
|
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
||||||
|
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||||
|
+
|
||||||
|
+Name: basisu_encoder
|
||||||
|
+Description: GPU compressed texture interchange system
|
||||||
|
+Version: @PROJECT_VERSION@
|
||||||
|
+Cflags: -I${includedir}
|
||||||
|
+Libs: -L${libdir} -lbasisu_encoder
|
||||||
|
diff --git a/encoder/basisu_comp.cpp b/encoder/basisu_comp.cpp
|
||||||
|
index 59a2a50..e9aa20f 100644
|
||||||
|
--- a/encoder/basisu_comp.cpp
|
||||||
|
+++ b/encoder/basisu_comp.cpp
|
||||||
|
@@ -33,7 +33,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/transcoder/basisu_transcoder.cpp b/transcoder/basisu_transcoder.cpp
|
||||||
|
index 0f7ca15..d7bce42 100644
|
||||||
|
--- a/transcoder/basisu_transcoder.cpp
|
||||||
|
+++ b/transcoder/basisu_transcoder.cpp
|
||||||
|
@@ -169,7 +169,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
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue