diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index bac079fb6..f8d01a0bc 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -291,6 +291,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) ### OPTION(WITH_NET "Build NLNET" ON ) OPTION(WITH_3D "Build NL3D" ON ) + OPTION(WITH_WEB "Build WEB" ON ) OPTION(WITH_GUI "Build GUI" ON ) OPTION(WITH_PACS "Build NLPACS" ON ) OPTION(WITH_GEORGES "Build NLGEORGES" ON ) diff --git a/code/nel/include/nel/CMakeLists.txt b/code/nel/include/nel/CMakeLists.txt index 4df9413b5..fda0ddbe9 100644 --- a/code/nel/include/nel/CMakeLists.txt +++ b/code/nel/include/nel/CMakeLists.txt @@ -4,6 +4,10 @@ IF(WITH_3D) SUBDIRS(3d) ENDIF() +IF(WITH_WEB OR WITH_GUI) + ADD_SUBDIRECTORY(web) +ENDIF() + IF(WITH_GUI) ADD_SUBDIRECTORY(gui) ENDIF() diff --git a/code/nel/include/nel/web/CMakeLists.txt b/code/nel/include/nel/web/CMakeLists.txt new file mode 100644 index 000000000..5e560aed8 --- /dev/null +++ b/code/nel/include/nel/web/CMakeLists.txt @@ -0,0 +1,2 @@ +FILE(GLOB HEADERS *.h) +INSTALL(FILES ${HEADERS} DESTINATION include/nel/web COMPONENT headers) diff --git a/code/nel/include/nel/misc/curl_certificates.h b/code/nel/include/nel/web/curl_certificates.h similarity index 98% rename from code/nel/include/nel/misc/curl_certificates.h rename to code/nel/include/nel/web/curl_certificates.h index 778074ca1..b2b031a1a 100644 --- a/code/nel/include/nel/misc/curl_certificates.h +++ b/code/nel/include/nel/web/curl_certificates.h @@ -22,7 +22,7 @@ // forward declaration to avoid curl.h inclusion everywhere typedef void CURL; -namespace NLMISC +namespace NLWEB { class CCurlCertificates { diff --git a/code/nel/include/nel/misc/http_client_curl.h b/code/nel/include/nel/web/http_client_curl.h similarity index 99% rename from code/nel/include/nel/misc/http_client_curl.h rename to code/nel/include/nel/web/http_client_curl.h index b282c2b70..ca005462c 100644 --- a/code/nel/include/nel/misc/http_client_curl.h +++ b/code/nel/include/nel/web/http_client_curl.h @@ -20,7 +20,7 @@ #include "nel/misc/types_nl.h" #include -namespace NLMISC +namespace NLWEB { /** diff --git a/code/nel/include/nel/misc/http_package_provider.h b/code/nel/include/nel/web/http_package_provider.h similarity index 80% rename from code/nel/include/nel/misc/http_package_provider.h rename to code/nel/include/nel/web/http_package_provider.h index b4b82d70a..99cb01b6e 100644 --- a/code/nel/include/nel/misc/http_package_provider.h +++ b/code/nel/include/nel/web/http_package_provider.h @@ -14,15 +14,15 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#ifndef NLMISC_HTTP_PACKAGE_PROVIDER_H -#define NLMISC_HTTP_PACKAGE_PROVIDER_H +#ifndef NLWEB_HTTP_PACKAGE_PROVIDER_H +#define NLWEB_HTTP_PACKAGE_PROVIDER_H #include #include -namespace NLMISC { +namespace NLWEB { -class CHttpPackageProvider : public IStreamedPackageProvider +class CHttpPackageProvider : public NLMISC::IStreamedPackageProvider { public: CHttpPackageProvider(); @@ -31,7 +31,7 @@ public: /// Download a file. This call is blocking /// filePath: [out] ex. /games/nel/stream/00/00/000000000.. /// hash: [in] - virtual bool getFile(std::string &filePath, const CHashKey &hash, const std::string &name) NL_OVERRIDE; + virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name) NL_OVERRIDE; public: /// Set storage path (ex. stream/) @@ -45,6 +45,6 @@ public: } /* namespace NLMISC */ -#endif /* #ifndef NLMISC_STREAMED_PACKAGE_MANAGER_H */ +#endif /* #ifndef NLWEB_HTTP_PACKAGE_PROVIDER_H */ /* end of file */ diff --git a/code/nel/src/CMakeLists.txt b/code/nel/src/CMakeLists.txt index 2b140340a..6da34b0d0 100644 --- a/code/nel/src/CMakeLists.txt +++ b/code/nel/src/CMakeLists.txt @@ -4,6 +4,10 @@ IF(WITH_3D) ADD_SUBDIRECTORY(3d) ENDIF() +IF(WITH_WEB OR WITH_GUI) + ADD_SUBDIRECTORY(web) +ENDIF() + IF(WITH_GUI) ADD_SUBDIRECTORY(gui) ENDIF() diff --git a/code/nel/src/gui/CMakeLists.txt b/code/nel/src/gui/CMakeLists.txt index 19c0cfea8..bb5a0b7f2 100644 --- a/code/nel/src/gui/CMakeLists.txt +++ b/code/nel/src/gui/CMakeLists.txt @@ -8,7 +8,7 @@ NL_TARGET_LIB(nelgui ${SRC} ${HEADERS}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS}) -TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES}) +TARGET_LINK_LIBRARIES(nelgui nelmisc nelweb nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES}) NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI") NL_ADD_RUNTIME_FLAGS(nelgui) diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index ce719f4b0..8179a6af0 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -47,7 +47,7 @@ #include "nel/gui/url_parser.h" #include "nel/gui/http_cache.h" #include "nel/gui/http_hsts.h" -#include "nel/misc/curl_certificates.h" +#include "nel/web/curl_certificates.h" #include "nel/gui/html_parser.h" #include "nel/gui/html_element.h" #include "nel/gui/css_style.h" @@ -550,7 +550,7 @@ namespace NLGUI if (toLower(download.url.substr(0, 8)) == "https://") { // if supported, use custom SSL context function to load certificates - CCurlCertificates::useCertificates(curl); + NLWEB::CCurlCertificates::useCertificates(curl); } download.data = new CCurlWWWData(curl, download.url); @@ -3823,7 +3823,7 @@ namespace NLGUI if (toLower(url.substr(0, 8)) == "https://") { // if supported, use custom SSL context function to load certificates - CCurlCertificates::useCertificates(curl); + NLWEB::CCurlCertificates::useCertificates(curl); } // do not follow redirects, we have own handler diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index 091e181cc..e7b422592 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -212,16 +212,16 @@ IF(UNIX) ENDIF() INCLUDE_DIRECTORIES(../../3rdparty) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} config_file) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file) -TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} nel_sevenzip) +TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY} nel_sevenzip) NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc") NL_ADD_RUNTIME_FLAGS(nelmisc) NL_ADD_LIB_SUFFIX(nelmisc) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS}) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp) diff --git a/code/nel/src/web/CMakeLists.txt b/code/nel/src/web/CMakeLists.txt new file mode 100644 index 000000000..042967fa2 --- /dev/null +++ b/code/nel/src/web/CMakeLists.txt @@ -0,0 +1,28 @@ +FILE(GLOB SRC *.cpp *.h) +FILE(GLOB HEADERS ../../include/nel/web/*.h) + +SOURCE_GROUP("" FILES ${SRC} ${HEADERS}) + +NL_TARGET_LIB(nelweb ${HEADERS} ${SRC}) + +INCLUDE_DIRECTORIES(../../3rdparty) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(nelweb ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} nelmisc nel_sevenzip) + +NL_DEFAULT_PROPS(nelweb "NeL, Library: NeL Web") +NL_ADD_RUNTIME_FLAGS(nelweb) + +NL_ADD_LIB_SUFFIX(nelweb) + +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS}) + +IF(WITH_PCH) + ADD_NATIVE_PRECOMPILED_HEADER(nelweb ${CMAKE_CURRENT_SOURCE_DIR}/stdweb.h ${CMAKE_CURRENT_SOURCE_DIR}/stdweb.cpp) +ENDIF() + +NL_GEN_PC(nel-web.pc) + +IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC) + INSTALL(TARGETS nelweb LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries) +ENDIF() diff --git a/code/nel/src/misc/curl_certificates.cpp b/code/nel/src/web/curl_certificates.cpp similarity index 97% rename from code/nel/src/misc/curl_certificates.cpp rename to code/nel/src/web/curl_certificates.cpp index 9dcdc72db..84b41e609 100644 --- a/code/nel/src/misc/curl_certificates.cpp +++ b/code/nel/src/web/curl_certificates.cpp @@ -14,26 +14,14 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include "stdmisc.h" -#include +#include "stdweb.h" +#include + #include #include #include #include -#include -#include -#include - -#include - -#ifdef NL_OS_WINDOWS -#include -#ifdef X509_NAME -#undef X509_NAME -#endif -#endif - // for compatibility with older versions #ifndef CURL_AT_LEAST_VERSION #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z) @@ -44,12 +32,13 @@ using namespace std; using namespace NLMISC; +using namespace NLWEB; #ifdef DEBUG_NEW #define new DEBUG_NEW #endif -namespace NLMISC +namespace NLWEB { // // x509CertList lifetime manager diff --git a/code/nel/src/misc/http_client_curl.cpp b/code/nel/src/web/http_client_curl.cpp similarity index 97% rename from code/nel/src/misc/http_client_curl.cpp rename to code/nel/src/web/http_client_curl.cpp index d335716b0..31d54767d 100644 --- a/code/nel/src/misc/http_client_curl.cpp +++ b/code/nel/src/web/http_client_curl.cpp @@ -14,16 +14,15 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include "stdmisc.h" -#include -#include - -#include +#include "stdweb.h" +#include -#include +#include +#include -using namespace NLMISC; using namespace std; +using namespace NLMISC; +using namespace NLWEB; #ifdef DEBUG_NEW #define new DEBUG_NEW @@ -31,7 +30,7 @@ using namespace std; #define _Curl (CURL *)_CurlStruct -namespace NLMISC +namespace NLWEB { // Ugly CURL callback diff --git a/code/nel/src/misc/http_package_provider.cpp b/code/nel/src/web/http_package_provider.cpp similarity index 96% rename from code/nel/src/misc/http_package_provider.cpp rename to code/nel/src/web/http_package_provider.cpp index 035fa2a5d..2ddc665b9 100644 --- a/code/nel/src/misc/http_package_provider.cpp +++ b/code/nel/src/web/http_package_provider.cpp @@ -14,20 +14,21 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include "stdmisc.h" - -// 3rd Party includes -#include +#include "stdweb.h" +#include // Project includes -#include #include #include #include #include #include -namespace NLMISC +using namespace std; +using namespace NLMISC; +using namespace NLWEB; + +namespace NLWEB { CHttpPackageProvider::CHttpPackageProvider() diff --git a/code/nel/src/web/stdweb.cpp b/code/nel/src/web/stdweb.cpp new file mode 100644 index 000000000..d85dbcdc5 --- /dev/null +++ b/code/nel/src/web/stdweb.cpp @@ -0,0 +1,17 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#include "stdweb.h" diff --git a/code/nel/src/web/stdweb.h b/code/nel/src/web/stdweb.h new file mode 100644 index 000000000..7234cd50d --- /dev/null +++ b/code/nel/src/web/stdweb.h @@ -0,0 +1,85 @@ +// NeL - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#ifndef NL_STDWEB_H +#define NL_STDWEB_H + +#if defined(_MSC_VER) && defined(_DEBUG) + #define _CRTDBG_MAP_ALLOC + #include + #include + #include + #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__) +#elif defined(_MSC_VER) + #include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#ifdef NL_OS_WINDOWS +# define WIN32_LEAN_AND_MEAN +# define _WIN32_WINDOWS 0x0500 +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0500 +# endif +# ifndef NL_COMP_MINGW +# define WINVER 0x0500 +# define NOMINMAX +# endif +# include +# include +# include +# ifdef X509_NAME +# undef X509_NAME +# endif +#endif + +#include + +#include +#include +#include + +#include + +#include + +#endif // NL_STDWEB_H diff --git a/code/ryzom/client/src/global.cpp b/code/ryzom/client/src/global.cpp index 41d41160c..9789b3b5b 100644 --- a/code/ryzom/client/src/global.cpp +++ b/code/ryzom/client/src/global.cpp @@ -25,7 +25,7 @@ using namespace NLMISC; // *************************************************************************** // Data -NLMISC::CHttpPackageProvider *HttpPackageProvider = NULL; +NLWEB::CHttpPackageProvider *HttpPackageProvider = NULL; // Main System NL3D::UDriver *Driver = NULL; // The main 3D Driver diff --git a/code/ryzom/client/src/global.h b/code/ryzom/client/src/global.h index 75ba2381d..8929f150c 100644 --- a/code/ryzom/client/src/global.h +++ b/code/ryzom/client/src/global.h @@ -28,7 +28,7 @@ // *************************************************************************** -namespace NLMISC +namespace NLWEB { class CHttpPackageProvider; } @@ -84,7 +84,7 @@ const float ExtraZoneLoadingVision = 100.f; // *************************************************************************** // Data -extern NLMISC::CHttpPackageProvider *HttpPackageProvider; // Http provider from on-the-fly downloaded game data +extern NLWEB::CHttpPackageProvider *HttpPackageProvider; // Http provider from on-the-fly downloaded game data // Main System extern NL3D::UDriver *Driver; // The main 3D Driver diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index 85eb50b51..b9287d884 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -35,7 +35,7 @@ #include "nel/misc/block_memory.h" #include "nel/misc/system_utils.h" #include "nel/misc/streamed_package_manager.h" -#include "nel/misc/http_package_provider.h" +#include "nel/web/http_package_provider.h" #include "nel/misc/cmd_args.h" // 3D Interface. #include "nel/3d/bloom_effect.h" @@ -743,7 +743,7 @@ void initStreamedPackageManager(NLMISC::IProgressCallback &progress) CStreamedPackageManager &spm = CStreamedPackageManager::getInstance(); nlassert(!spm.Provider); // If this asserts, init was called twice without release nlassert(!HttpPackageProvider); // Idem - CHttpPackageProvider *hpp = new CHttpPackageProvider(); + NLWEB::CHttpPackageProvider *hpp = new NLWEB::CHttpPackageProvider(); hpp->Path = ClientCfg.StreamedPackagePath; for (uint i = 0; i < ClientCfg.StreamedPackageHosts.size(); i++) hpp->Hosts.push_back(ClientCfg.StreamedPackageHosts[i]); diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index 47c11d899..e22aba478 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -28,7 +28,7 @@ #include "nel/misc/path.h" #include "nel/misc/sheet_id.h" #include "nel/misc/big_file.h" -#include "nel/misc/curl_certificates.h" +#include "nel/web/curl_certificates.h" // 3D Interface. #include "nel/3d/bloom_effect.h" #include "nel/3d/u_driver.h" @@ -190,8 +190,8 @@ struct CStatThread : public NLMISC::IRunnable curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); if (url.length() > 8 && (url[4] == 's' || url[4] == 'S')) // 01234 https { - NLMISC::CCurlCertificates::addCertificateFile("cacert.pem"); - NLMISC::CCurlCertificates::useCertificates(curl); + NLWEB::CCurlCertificates::addCertificateFile("cacert.pem"); + NLWEB::CCurlCertificates::useCertificates(curl); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L); } diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp index 5ec107bcb..0cb00ded0 100644 --- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp @@ -30,7 +30,7 @@ #include "../connection.h" #include -#include "nel/misc/curl_certificates.h" +#include "nel/web/curl_certificates.h" using namespace std; using namespace NLMISC; @@ -188,7 +188,7 @@ public: curl_easy_setopt(Curl, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(Curl, CURLOPT_WRITEFUNCTION, writeDataFromCurl); - NLMISC::CCurlCertificates::useCertificates(Curl); + NLWEB::CCurlCertificates::useCertificates(Curl); } ~CWebigNotificationThread() diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index d01e89a24..a1efa5d1a 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -113,7 +113,7 @@ #include "nel/gui/lua_helper.h" using namespace NLGUI; #include "nel/gui/lua_ihm.h" -#include "nel/misc/curl_certificates.h" +#include "nel/web/curl_certificates.h" #include "lua_ihm_ryzom.h" @@ -480,7 +480,7 @@ CInterfaceManager::CInterfaceManager() if (!ClientCfg.CurlCABundle.empty()) { // specify custom CA certs, lookup will be made in this function - NLMISC::CCurlCertificates::addCertificateFile(ClientCfg.CurlCABundle); + NLWEB::CCurlCertificates::addCertificateFile(ClientCfg.CurlCABundle); } NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS ); diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 4bc8c10be..7cc58dfd7 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -51,7 +51,7 @@ #include "global.h" #include "input.h" #include "nel/gui/libwww.h" -#include "nel/misc/http_client_curl.h" +#include "nel/web/http_client_curl.h" #include "login_progress_post_thread.h" #include "init.h" @@ -69,6 +69,7 @@ void ConnectToShard(); // *************************************************************************** using namespace NLMISC; +using namespace NLWEB; using namespace NLNET; using namespace NL3D; using namespace std; diff --git a/code/ryzom/client/src/login.h b/code/ryzom/client/src/login.h index d01f0ea8a..d3025837d 100644 --- a/code/ryzom/client/src/login.h +++ b/code/ryzom/client/src/login.h @@ -19,7 +19,7 @@ #define CL_LOGIN_H #include -#include +#include #include #include @@ -74,7 +74,7 @@ extern sint32 ShardSelected; /* * HTTP client preconfigured to connect to the startup login host */ -class CStartupHttpClient : public NLMISC::CCurlHttpClient +class CStartupHttpClient : public NLWEB::CCurlHttpClient { public: diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index ca91fcbfa..3814d3a46 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -49,7 +49,7 @@ #include "nel/misc/i18n.h" #include "nel/misc/cmd_args.h" #include "nel/misc/seven_zip.h" -#include "nel/misc/curl_certificates.h" +#include "nel/web/curl_certificates.h" #include "game_share/bg_downloader_msg.h" @@ -1431,8 +1431,8 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de curl_easy_setopt(curl, CURLOPT_URL, source.c_str()); if (source.length() > 8 && (source[4] == 's' || source[4] == 'S')) // 01234 https { - NLMISC::CCurlCertificates::addCertificateFile("cacert.pem"); - NLMISC::CCurlCertificates::useCertificates(curl); + NLWEB::CCurlCertificates::addCertificateFile("cacert.pem"); + NLWEB::CCurlCertificates::useCertificates(curl); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L); } diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 810f4ccfd..fa6648c38 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -21,6 +21,7 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(ryzom_client_patcher nelmisc + nelweb nelnet ryzom_gameshare nel_sevenzip