summaryrefslogtreecommitdiff
path: root/libs/libcurl
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-11-10 18:37:31 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-11-10 18:37:31 +0300
commit5a3c6c39fa1cc3202a20e8c45a95fff9496d6205 (patch)
tree523683ffbb19b9fe4429b516b855b20a7405ed86 /libs/libcurl
parentd34a80f41a4bdae108d5f77e3397bc893fbacf6e (diff)
fixes #1018 (libcurl doesn't have SSL support)
Diffstat (limited to 'libs/libcurl')
-rw-r--r--libs/libcurl/libcurl.vcxproj2
-rw-r--r--libs/libcurl/src/curl_setup.h45
2 files changed, 4 insertions, 43 deletions
diff --git a/libs/libcurl/libcurl.vcxproj b/libs/libcurl/libcurl.vcxproj
index 3de128523a..e9c0aa9e2c 100644
--- a/libs/libcurl/libcurl.vcxproj
+++ b/libs/libcurl/libcurl.vcxproj
@@ -32,7 +32,7 @@
<DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>libeay32.lib;ssleay32.lib;wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
diff --git a/libs/libcurl/src/curl_setup.h b/libs/libcurl/src/curl_setup.h
index 7edeca2123..424a4915b8 100644
--- a/libs/libcurl/src/curl_setup.h
+++ b/libs/libcurl/src/curl_setup.h
@@ -36,49 +36,10 @@
* configuration file for platforms which lack config tool.
*/
-#ifdef HAVE_CONFIG_H
+#include "config-win32.h"
-#include "curl_config.h"
-
-#else /* HAVE_CONFIG_H */
-
-#ifdef _WIN32_WCE
-# include "config-win32ce.h"
-#else
-# ifdef WIN32
-# include "config-win32.h"
-# endif
-#endif
-
-#if defined(macintosh) && defined(__MRC__)
-# include "config-mac.h"
-#endif
-
-#ifdef __riscos__
-# include "config-riscos.h"
-#endif
-
-#ifdef __AMIGA__
-# include "config-amigaos.h"
-#endif
-
-#ifdef __SYMBIAN32__
-# include "config-symbian.h"
-#endif
-
-#ifdef __OS400__
-# include "config-os400.h"
-#endif
-
-#ifdef TPF
-# include "config-tpf.h"
-#endif
-
-#ifdef __VXWORKS__
-# include "config-vxworks.h"
-#endif
-
-#endif /* HAVE_CONFIG_H */
+#define USE_SSLEAY
+#define USE_OPENSSL
/* ================================================================ */
/* Definition of preprocessor macros/symbols which modify compiler */