diff --git a/CMakeLists.txt b/CMakeLists.txt index 7262e35f..15416010 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,6 +321,7 @@ if(BUILD_DEPENDENCIES) if(ENABLE_ZLIBNG) add_subdirectory(external/zlib-ng) else() + set(ZLIB_BUILD_EXAMPLES False CACHE BOOL "Don't build zlib examples") add_subdirectory(external/zlib) endif() @@ -628,8 +629,8 @@ else() WORKING_DIRECTORY "$" COMMAND rm lib${PROJECT_NAME}-${LT_RELEASE}.so COMMAND rm lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_RELEASE} - COMMAND ln lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION} lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION_SHORT} - COMMAND ln lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION} lib${PROJECT_NAME}-${LT_RELEASE}.so + COMMAND ln -f lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION} lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION_SHORT} + COMMAND ln -f lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION} lib${PROJECT_NAME}-${LT_RELEASE}.so ) endif() endif() diff --git a/LibZipSharp.props b/LibZipSharp.props index 8ae35007..d0e41804 100644 --- a/LibZipSharp.props +++ b/LibZipSharp.props @@ -1,8 +1,8 @@ <_LibZipSharpAssemblyVersionMajor>3 - <_LibZipSharpAssemblyVersionMinor>1 - <_LibZipSharpAssemblyVersionPatch>1 + <_LibZipSharpAssemblyVersionMinor>2 + <_LibZipSharpAssemblyVersionPatch>0 <_LibZipSharpAssemblyVersion>$(_LibZipSharpAssemblyVersionMajor).$(_LibZipSharpAssemblyVersionMinor).$(_LibZipSharpAssemblyVersionPatch) <_NativeLibraryVersionForName>$(_LibZipSharpAssemblyVersionMajor)-$(_LibZipSharpAssemblyVersionMinor) <_NativeLibraryBaseName>libZipSharpNative-$(_NativeLibraryVersionForName) diff --git a/build.sh b/build.sh index 82789aaf..2264d22c 100755 --- a/build.sh +++ b/build.sh @@ -251,14 +251,6 @@ if [ -z "${NINJA}" ]; then die ninja binary must be specified fi -if [ "${USE_ZLIBNG}" == "no" ]; then - ZLIB_CMAKELISTS_PATH="${ZLIB_DIR}/CMakeLists.txt" - if ! $(grep 'lzs: disable-examples' "${ZLIB_CMAKELISTS_PATH}" > /dev/null 2>&1); then - print_banner Applying zlib patch - $(cd "${ZLIB_DIR}"; git apply "${MY_DIR}/zlib-changes.patch") - fi -fi - if [ "${REBUILD}" == "yes" ]; then rm -rf "${BUILD_DIR_ROOT}" rm -rf "${ARTIFACTS_DIR_ROOT}" diff --git a/external/zlib b/external/zlib index 09155eaa..51b7f2ab 160000 --- a/external/zlib +++ b/external/zlib @@ -1 +1 @@ -Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851 +Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf diff --git a/external/zlib-ng b/external/zlib-ng index 54b1c13c..74253725 160000 --- a/external/zlib-ng +++ b/external/zlib-ng @@ -1 +1 @@ -Subproject commit 54b1c13c37b53f2481f02576657cedfef29fce2f +Subproject commit 74253725f884e2424a0dd8ae3f69896d5377f325 diff --git a/external/zstd b/external/zstd index 63779c79..794ea1b0 160000 --- a/external/zstd +++ b/external/zstd @@ -1 +1 @@ -Subproject commit 63779c798237346c2b245c546c40b72a5a5913fe +Subproject commit 794ea1b0afca0f020f4e57b6732332231fb23c70 diff --git a/zlib-changes.patch b/zlib-changes.patch deleted file mode 100644 index 37247eb0..00000000 --- a/zlib-changes.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0fe939d..f3ad0ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -229,7 +229,7 @@ endif() - #============================================================================ - # Example binaries - #============================================================================ -- -+if(False) # lzs: disable-examples - add_executable(example test/example.c) - target_link_libraries(example zlib) - add_test(example example) -@@ -247,3 +247,4 @@ if(HAVE_OFF64_T) - target_link_libraries(minigzip64 zlib) - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") - endif() -+endif()