Link LZIP directly instead of as a static library.

This commit is contained in:
2021-11-12 04:24:43 +00:00
parent bdc65bc851
commit a680ffe985
3 changed files with 4 additions and 9 deletions

View File

@@ -1,5 +1,3 @@
include(lzip.cmake)
include(lzfse.cmake)
include(lzma.cmake)

8
3rdparty/lzip.cmake vendored
View File

@@ -1,9 +1,5 @@
project(lzlib C)
set("LZIP_DIRECTORY" "lzlib-1.12")
set("LZIP_DIRECTORY" "3rdparty/lzlib-1.12")
message(STATUS "LZIP VERSION: 1.12")
add_library(lzlib STATIC ${LZIP_DIRECTORY}/lzlib.c)
set_property(TARGET lzlib PROPERTY C_VISIBILITY_PRESET hidden)
target_sources("Aaru.Compression.Native" PRIVATE ${LZIP_DIRECTORY}/lzlib.c)

View File

@@ -97,6 +97,7 @@ add_library("Aaru.Compression.Native" SHARED library.c apple_rle.c apple_rle.h a
include(3rdparty/bzip2.cmake)
include(3rdparty/flac.cmake)
include(3rdparty/lzip.cmake)
MACRO(TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE target)
if("${CMAKE_C_COMPILER_ID}" MATCHES "MSVC")
@@ -117,7 +118,7 @@ MACRO(TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE target)
ENDIF()
ENDMACRO()
TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" lzlib lzfse libzstd_static lzma m)
TARGET_LINK_LIBRARIES_WHOLE_ARCHIVE("Aaru.Compression.Native" lzfse libzstd_static lzma m)
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
set_property(TARGET "Aaru.Compression.Native" PROPERTY POSITION_INDEPENDENT_CODE TRUE)