TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-05-08 18:54:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove zlib"

Browse Source 
This reverts commit d874a1fd14.

Conflicts:
* CMakeLists.txt:
  * ENABLE_ZLIB_SUPPORT: there has been a change immediately after
    where it was removed. Just re-add what was removed.
* tests/CMakeLists.txt:
  * ENABLE_ZLIB_SUPPORT: there has been a change immediately after
    where it was removed. Just re-add what was removed.
This commit is contained in:
Gilles Peskine
2020-02-26 19:11:43 +01:00
committed by Ronald Cron
parent 70824f2c9e
commit 5bb8bec1de
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
programs/Makefile
View File

@@ -44,6 +44,11 @@ EXEXT=
SHARED_SUFFIX=
endif
# Zlib shared library extensions:
ifdef ZLIB
LOCAL_LDFLAGS += -lz
endif
APPS = \
aes/aescrypt2$(EXEXT) \
aes/crypt_and_hash$(EXEXT) \

4
programs/test/CMakeLists.txt
View File

@@ -2,6 +2,10 @@ set(libs
mbedtls
)
if(ENABLE_ZLIB_SUPPORT)
set(libs ${libs} ${ZLIB_LIBRARIES})
endif(ENABLE_ZLIB_SUPPORT)
add_executable(selftest selftest.c)
target_link_libraries(selftest ${libs})