projects/guix·blob java-team · refs

302 lines · 12.0 KiB

1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index e2c7a1d..b6c860f 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -1,141 +1,13 @@
6 # Important: The Basis Universal encoder and transcoder libraries must be compiled with -fno-strict-aliasing (MSVC's default, and also the Linux kernel).
7 # It should also work without this option, but we do not test with it.
8-cmake_minimum_required(VERSION 3.5)
9+cmake_minimum_required(VERSION 3.31)
10
11 project(basisu)
12-option(STATIC "static linking" FALSE)
13-option(SAN "sanitize" FALSE)
14+find_package(PkgConfig)
15
16-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
17+add_compile_options("-fno-strict-aliasing")
18+add_compile_definitions(BASISU_SUPPORT_SSE=0 BASISD_SUPPORT_KTX2_ZSTD=1 BASISU_SUPPORT_OPENCL=0)
19
20-# For MSVC builds default to SSE enabled, and determine if it's a 64-bit (-A x64) vs. 32-bit (-A Win32) build.
21-if (MSVC)
22- option(SSE "SSE 4.1 support" TRUE)
23- if ( CMAKE_GENERATOR_PLATFORM STREQUAL Win32 )
24- set(BUILD_X64 0)
25- else()
26- set(BUILD_X64 1)
27- endif()
28- add_compile_options(/W4)
29-else()
30- option(SSE "SSE 4.1 support" FALSE)
31- option(BUILD_X64 "build 64-bit" TRUE)
32-endif()
33-
34-option(ZSTD "ZSTD support for KTX2 transcoding/encoding" TRUE)
35-option(OPENCL "OpenCL support in encoder" FALSE)
36-
37-message("Initial BUILD_X64=${BUILD_X64}")
38-message("Initial CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
39-message("Initial SSE=${SSE}")
40-message("Initial ZSTD=${ZSTD}")
41-message("Initial OPENCL=${OPENCL}")
42-message("Initial SAN=${SAN}")
43-
44-if ((NOT MSVC) AND OPENCL)
45- # 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.
46- # Otherwise we use the system's (if any).
47- find_package(OpenCL)
48- message(STATUS "OpenCL found: ${OPENCL_FOUND}")
49- message(STATUS "OpenCL includes: ${OpenCL_INCLUDE_DIRS}")
50- message(STATUS "OpenCL libraries: ${OpenCL_LIBRARIES}")
51-endif()
52-
53-if( NOT CMAKE_BUILD_TYPE )
54- set( CMAKE_BUILD_TYPE Release )
55-endif()
56-
57-message(${PROJECT_NAME} " build type: " ${CMAKE_BUILD_TYPE})
58-
59-if (BUILD_X64)
60- message("Building 64-bit")
61-else()
62- message("Building 32-bit")
63-endif()
64-
65-if (SSE)
66- message("SSE enabled")
67-else()
68- message("SSE disabled")
69-endif()
70-
71-if (ZSTD)
72- message("Zstandard enabled")
73-else()
74- message("Zstandard disabled")
75-endif()
76-
77-if (NOT MSVC)
78- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
79- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
80-
81- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
82- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
83-
84- if (SAN)
85- message("Enabling SAN")
86-
87- set(SANITIZE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize=alignment")
88-
89- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
90- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${SANITIZE_FLAGS}")
91-
92- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
93- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SANITIZE_FLAGS}")
94- endif()
95-
96- set(CMAKE_CXX_FLAGS -std=c++17)
97- 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")
98-
99- if (NOT BUILD_X64)
100- set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -m32")
101- endif()
102-
103- if (EMSCRIPTEN)
104- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -DBASISU_SUPPORT_SSE=0")
105- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_MEMORY_GROWTH=1 -DBASISU_SUPPORT_SSE=0")
106-
107- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS}")
108- elseif (STATIC)
109- if (SSE)
110- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
111- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
112- else()
113- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
114- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
115- endif()
116-
117- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -static-libgcc -static-libstdc++ -static")
118- else()
119- if (SSE)
120- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
121- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=1 -msse4.1")
122- else()
123- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
124- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
125- endif()
126-
127- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS} -Wl,-rpath .")
128- endif()
129-
130- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GCC_COMPILE_FLAGS}")
131- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GCC_COMPILE_FLAGS}")
132- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${GCC_COMPILE_FLAGS} -D_DEBUG")
133-
134- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
135- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GCC_COMPILE_FLAGS}")
136- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GCC_COMPILE_FLAGS} -D_DEBUG")
137-else()
138- if (SSE)
139- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=1")
140- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=1")
141- else()
142- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_SSE=0")
143- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_SSE=0")
144- endif()
145-endif()
146-
147-# Define the source files for the static library
148 set(ENCODER_LIB_SRC_LIST
149 encoder/basisu_backend.cpp
150 encoder/basisu_basis_file.cpp
151@@ -161,94 +33,26 @@ set(ENCODER_LIB_SRC_LIST
152 encoder/3rdparty/tinyexr.cpp
153 transcoder/basisu_transcoder.cpp
154 )
155+set(ENCODER_LIB_HEADER_LIST
156+ transcoder/basisu.h
157+ transcoder/basisu_containers.h
158+ transcoder/basisu_file_headers.h
159+ transcoder/basisu_transcoder.h
160+ transcoder/basisu_transcoder_internal.h
161+ transcoder/basisu_transcoder_uastc.h
162+)
163
164-if (ZSTD)
165- set(ENCODER_LIB_SRC_LIST ${ENCODER_LIB_SRC_LIST} zstd/zstd.c)
166-endif()
167-
168-# Create the static library
169-add_library(basisu_encoder STATIC ${ENCODER_LIB_SRC_LIST})
170-
171-# Create the basisu executable and link against the static library
172+add_library(basisu_encoder SHARED ${ENCODER_LIB_SRC_LIST})
173 add_executable(basisu basisu_tool.cpp)
174 target_link_libraries(basisu PRIVATE basisu_encoder)
175
176-# Create the new example executable and link against the static library
177-add_executable(examples example/example.cpp)
178-target_link_libraries(examples PRIVATE basisu_encoder)
179-
180-if (ZSTD)
181- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
182- target_compile_definitions(examples PRIVATE BASISD_SUPPORT_KTX2_ZSTD=1)
183-else()
184- target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
185- target_compile_definitions(examples PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0)
186-endif()
187-
188-if (NOT MSVC)
189- # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us.
190- if (OPENCL AND OPENCL_FOUND)
191- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
192- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
193-
194- target_include_directories(basisu PRIVATE ${OpenCL_INCLUDE_DIRS})
195- target_include_directories(examples PRIVATE ${OpenCL_INCLUDE_DIRS})
196- target_include_directories(basisu_encoder PRIVATE ${OpenCL_INCLUDE_DIRS})
197- set(BASISU_EXTRA_LIBS ${OpenCL_LIBRARIES})
198- endif()
199-else()
200- # For Windows builds, we use our local copies of the OpenCL import lib and Khronos headers.
201- if (OPENCL)
202- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
203- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBASISU_SUPPORT_OPENCL=1")
204-
205- target_include_directories(basisu PRIVATE "OpenCL")
206- target_include_directories(examples PRIVATE "OpenCL")
207- target_include_directories(basisu_encoder PRIVATE "OpenCL")
208-
209- if (BUILD_X64)
210- target_link_libraries(basisu PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL64.lib")
211- target_link_libraries(examples PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL64.lib")
212- else()
213- target_link_libraries(basisu PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL.lib")
214- target_link_libraries(examples PRIVATE "${CMAKE_SOURCE_DIR}/OpenCL/lib/OpenCL.lib")
215- endif()
216- endif()
217-endif()
218-
219-if (NOT MSVC)
220- target_link_libraries(basisu PRIVATE m pthread ${BASISU_EXTRA_LIBS})
221- target_link_libraries(examples PRIVATE m pthread ${BASISU_EXTRA_LIBS})
222-endif()
223+pkg_check_modules(ZSTD REQUIRED libzstd)
224+target_include_directories(basisu_encoder SYSTEM PUBLIC ${ZSTD_INCLUDE_DIRS})
225+target_link_libraries(basisu_encoder PUBLIC ${ZSTD_LINK_LIBRARIES})
226
227-if (NOT EMSCRIPTEN)
228- if (UNIX)
229- if (CMAKE_BUILD_TYPE STREQUAL Release)
230- if (APPLE)
231- add_custom_command(TARGET basisu POST_BUILD COMMAND strip -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu)
232- #message("strip command: strip -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu")
233- else()
234- add_custom_command(TARGET basisu POST_BUILD COMMAND strip -g -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu)
235- #message("strip command: strip -g -X -x ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/basisu")
236- endif()
237- endif()
238- endif()
239-endif()
240+include(GNUInstallDirs)
241+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/basisu_encoder.pc.in ${CMAKE_CURRENT_BINARY_DIR}/basisu_encoder.pc @ONLY)
242
243-if (MSVC)
244- set_target_properties(basisu PROPERTIES
245- RUNTIME_OUTPUT_NAME "basisu"
246- RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
247- RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
248- RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
249- RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
250- )
251-
252- set_target_properties(examples PROPERTIES
253- RUNTIME_OUTPUT_NAME "examples"
254- RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
255- RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
256- RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
257- RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
258- )
259-endif()
260+install(TARGETS basisu basisu_encoder)
261+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/basisu_encoder.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
262+install(FILES ${ENCODER_LIB_HEADER_LIST} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
263diff --git a/basisu_encoder.pc.in b/basisu_encoder.pc.in
264new file mode 100644
265index 0000000..0ba05a1
266--- /dev/null
267+++ b/basisu_encoder.pc.in
268@@ -0,0 +1,8 @@
269+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
270+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
271+
272+Name: basisu_encoder
273+Description: GPU compressed texture interchange system
274+Version: @PROJECT_VERSION@
275+Cflags: -I${includedir}
276+Libs: -L${libdir} -lbasisu_encoder
277diff --git a/encoder/basisu_comp.cpp b/encoder/basisu_comp.cpp
278index 59a2a50..e9aa20f 100644
279--- a/encoder/basisu_comp.cpp
280+++ b/encoder/basisu_comp.cpp
281@@ -33,7 +33,7 @@
282 #endif
283
284 #if BASISD_SUPPORT_KTX2_ZSTD
285-#include "../zstd/zstd.h"
286+#include <zstd.h>
287 #endif
288
289 // Set to 1 to disable the mipPadding alignment workaround (which only seems to be needed when no key-values are written at all)
290diff --git a/transcoder/basisu_transcoder.cpp b/transcoder/basisu_transcoder.cpp
291index 0f7ca15..d7bce42 100644
292--- a/transcoder/basisu_transcoder.cpp
293+++ b/transcoder/basisu_transcoder.cpp
294@@ -169,7 +169,7 @@
295 // If BASISD_SUPPORT_KTX2_ZSTD is 0, UASTC files compressed with Zstd cannot be loaded.
296 #if BASISD_SUPPORT_KTX2_ZSTD
297 // We only use two Zstd API's: ZSTD_decompress() and ZSTD_isError()
298- #include "../zstd/zstd.h"
299+ #include <zstd.h>
300 #endif
301 #endif
302