mirror of
https://git.suyu.dev/suyu/mbedtls.git
synced 2026-01-06 06:28:56 +01:00
Merge branch 'development' into dtls
* development: (46 commits) Fix url again Fix small bug in base64_encode() Fix depend that was checked but not documented Fix dependency that was not checked Minor gitginore fixes Move some ignore patterns to subdirectories Ignore CMake/MSVC-related build files. Re-categorize changelog entry Fix misattribution Minor nits with stdout/stderr. Add cmake compatibility targets Add script for polarssl symlink creation Fix more stdio inclusion issues Add debug info for cert/suite selection Fix possible portability issue Fix bug in ssl_get_verify_result() aescrypt2.c local char array not initial Update Changelog Fix mips64 bignum implementation Fix usage string of ssl_client2 ... Conflicts: include/polarssl/ssl.h library/CMakeLists.txt library/Makefile programs/Makefile programs/ssl/ssl_client2.c programs/ssl/ssl_server2.c visualc/VS2010/PolarSSL.sln visualc/VS2010/mbedTLS.vcxproj visualc/VS6/mbedtls.dsp visualc/VS6/mbedtls.dsw
This commit is contained in:
commit
2a0718d947
267 changed files with 5475 additions and 3350 deletions
|
|
@ -7,14 +7,14 @@ CFLAGS += -I../include -D_FILE_OFFSET_BITS=64 -Wall -W -Wdeclaration-after-state
|
|||
-Wno-unused-function -Wno-unused-value
|
||||
|
||||
OFLAGS = -O2
|
||||
LDFLAGS += -L../library -lpolarssl $(SYS_LDFLAGS)
|
||||
LDFLAGS += -L../library -lmbedtls $(SYS_LDFLAGS)
|
||||
|
||||
ifndef SHARED
|
||||
DEP=../library/libpolarssl.a
|
||||
DEP=../library/libmbedtls.a
|
||||
CHECK_PRELOAD=
|
||||
else
|
||||
DEP=../library/libpolarssl.so
|
||||
CHECK_PRELOAD= LD_PRELOAD=../library/libpolarssl.so
|
||||
DEP=../library/libmbedtls.so
|
||||
CHECK_PRELOAD= LD_PRELOAD=../library/libmbedtls.so
|
||||
endif
|
||||
|
||||
ifdef DEBUG
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue