diff options
| author | Alessandro Ghedini <alessandro@ghedini.me> | 2014-07-16 18:59:36 +0200 |
|---|---|---|
| committer | Alessandro Ghedini <alessandro@ghedini.me> | 2014-07-16 18:59:36 +0200 |
| commit | 2f09eeb790c9b3b5c416e653040c2f48536ba4e1 (patch) | |
| tree | d7f50271d8c8769becb7c9d73d00cbacaaaaeb66 /winbuild | |
| parent | a87e878305851b0d8c48f5c06370ab8d0725560a (diff) | |
Imported Upstream version 7.37.1
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/Makefile.vc | 6 | ||||
| -rw-r--r-- | winbuild/MakefileBuild.vc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 2bfc17a5..90719a88 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -95,7 +95,11 @@ USE_SPNEGO = false !ENDIF
!IFNDEF ENABLE_WINSSL
+!IFDEF WITH_SSL
+USE_WINSSL = false
+!ELSE
USE_WINSSL = $(USE_SSPI)
+!ENDIF
!ELSEIF "$(ENABLE_WINSSL)"=="yes"
USE_WINSSL = true
!ELSEIF "$(ENABLE_WINSSL)"=="no"
@@ -199,4 +203,4 @@ $(MODE): copy_from_lib:
echo copying .c...
- FOR %%i IN ($(CURLX_ONES:/=\)) DO copy %%i ..\src\
+ FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 58ed7089..828fe4f0 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -112,7 +112,7 @@ SSL_LIBS = libeay32.lib ssleay32.lib USE_SSL = true
SSL = dll
!ELSEIF "$(WITH_SSL)"=="static"
-SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib
+SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib crypt32.lib
USE_SSL = true
SSL = static
!ENDIF
|