Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorAndris Mednis <Andris.Mednis@zabbix.com>2020-02-05 16:38:14 +0300
committerAndris Mednis <Andris.Mednis@zabbix.com>2020-02-05 16:38:14 +0300
commitfb8b776fabc2ed2c4374d6de3b45fabaa7e9a3ba (patch)
tree273acf9097ee0f154160fc269df56089a6b7f4ef /build
parent78e6a49fc1d65c186879707e23ce4fb8d965fc5b (diff)
...G...... [ZBXNEXT-5716] removed mbedTLS from configuration on Windows
Diffstat (limited to 'build')
-rw-r--r--build/win32/project/Makefile_tls.inc12
1 files changed, 3 insertions, 9 deletions
diff --git a/build/win32/project/Makefile_tls.inc b/build/win32/project/Makefile_tls.inc
index ad2c88b395c..5bdb9f950d8 100644
--- a/build/win32/project/Makefile_tls.inc
+++ b/build/win32/project/Makefile_tls.inc
@@ -1,7 +1,7 @@
!IF "$(TLS)" != ""
-! IF "$(TLS)" != "mbedtls" && "$(TLS)" != "gnutls" && "$(TLS)" != "openssl"
-! ERROR Specified TLS target "$(TLS)" is not supported (supported: mbedtls, gnutls, openssl).
+! IF "$(TLS)" != "gnutls" && "$(TLS)" != "openssl"
+! ERROR Specified TLS target "$(TLS)" is not supported (supported: gnutls, openssl).
! ENDIF
! IF "$(TLSINCDIR)" == ""
@@ -38,14 +38,8 @@ ADDMSG = You may specify path to library using TLSLIB="\somepath\lib\some.lib"
! ENDIF
! ENDIF
- ### mbed TLS ###
-! IF "$(TLS)" == "mbedtls"
-! IF "$(TLSLIBDIR)" != ""
-TLSLIB = $(TLSLIBDIR)\mbedtls.lib
-! ENDIF
-CFLAGS = $(CFLAGS) /DHAVE_POLARSSL
### GnuTLS ###
-! ELSEIF "$(TLS)" == "gnutls"
+! IF "$(TLS)" == "gnutls"
CFLAGS = $(CFLAGS) /DHAVE_GNUTLS
### OpenSSL ###
! ELSEIF "$(TLS)" == "openssl"