diff options
| -rw-r--r-- | winbuild/Makefile.vc | 2 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 4cf7c4480..a75747877 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -77,7 +77,7 @@ USE_IDN = false !ENDIF
!IFNDEF ENABLE_WINSSL
-USE_WINSSL = true
+USE_WINSSL = $(USE_SSPI)
!ELSEIF "$(ENABLE_WINSSL)"=="yes"
USE_WINSSL = true
!ELSEIF "$(ENABLE_WINSSL)"=="no"
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 5791dee03..5ec638f85 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -143,22 +143,6 @@ SSH2_CFLAGS = $(SSH2_CFLAGS) /I$(WITH_DEVEL)/include/libssh2 !ENDIF
-!IFNDEF USE_WINSSL
-!IF "$(USE_SSL)"=="true"
-USE_WINSSL = false
-!ELSE
-USE_WINSSL = true
-!ENDIF
-!ELSEIF "$(USE_WINSSL)"=="yes"
-USE_WINSSL = true
-!ENDIF
-
-!IF "$(USE_WINSSL)"=="true"
-SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
-USE_SSPI = true
-!ENDIF
-
-
!IFNDEF USE_SSPI
USE_SSPI = true
!ELSEIF "$(USE_SSPI)"=="yes"
@@ -193,6 +177,24 @@ LFLAGS = $(LFLAGS) Normaliz.lib !ENDIF
+!IFNDEF USE_WINSSL
+!IF "$(USE_SSL)"=="true"
+USE_WINSSL = false
+!ELSE
+USE_WINSSL = $(USE_SSPI)
+!ENDIF
+!ELSEIF "$(USE_WINSSL)"=="yes"
+USE_WINSSL = true
+!ENDIF
+
+!IF "$(USE_WINSSL)"=="true"
+!IF "$(USE_SSPI)"!="true"
+!ERROR cannot build with WinSSL without SSPI
+!ENDIF
+SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL
+!ENDIF
+
+
!IF "$(GEN_PDB)"=="yes"
GEN_PDB = true
|