Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/gui/CMakeLists.txt

@@ -9,6 +9,11 @@ NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
+
+IF(WIN32)
+  TARGET_LINK_LIBRARIES(nelgui Crypt32 Cryptui)
+ENDIF()
+
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)
 

code/nel/src/gui/curl_certificates.cpp

@@ -86,7 +86,7 @@ namespace NLGUI
 			}
 			else
 			{
-				// if CURL is using SSPI under Windows or SecureChannel under OS X, we'll use native system CA Certs
+				// if CURL is using SSPI or SChannel under Windows or DarwinSSL under OS X, we'll use native system CA Certs
 				isUsingOpenSSLBackend = false;
 			}
 
@@ -122,14 +122,14 @@ namespace NLGUI
 
 		void addCertificatesFromFile(const std::string &cert)
 		{
+			if (!isUsingOpenSSLBackend) return;
+
 			if (!isInitialized)
 			{
 				nlwarning("You MUST call NLGUI::CCurlCertificates::init before adding new certificates");
 				return;
 			}
 
-			if (!isUsingOpenSSLBackend) return;
-
 			// this file was already loaded
 			if (std::find(FilesList.begin(), FilesList.end(), cert) != FilesList.end()) return;