mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-23 07:36:16 +00:00
Visual Studio 2013 compilation support for Ryzom Client
--HG-- branch : develop
This commit is contained in:
parent
2667c5d8a2
commit
a8db3b2dda
6 changed files with 17 additions and 9 deletions
|
@ -156,9 +156,11 @@ IF(WITH_NEL)
|
|||
FIND_PACKAGE(Luabind REQUIRED)
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
|
||||
IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
|
||||
IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
||||
SET(CURL_STATIC ON)
|
||||
ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
|
||||
ELSE((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
||||
SET(CURL_STATIC OFF)
|
||||
ENDIF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
|
||||
|
||||
IF(CURL_STATIC)
|
||||
SET(CURL_DEFINITIONS -DCURL_STATICLIB)
|
||||
|
|
|
@ -255,6 +255,11 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
|||
ELSE(WITH_STATIC)
|
||||
OPTION(WITH_STATIC_LIBXML2 "With static libxml2" OFF)
|
||||
ENDIF(WITH_STATIC)
|
||||
IF (WITH_STATIC)
|
||||
OPTION(WITH_STATIC_CURL "With static curl" ON )
|
||||
ELSE(WITH_STATIC)
|
||||
OPTION(WITH_STATIC_CURL "With static curl" OFF)
|
||||
ENDIF(WITH_STATIC)
|
||||
IF(APPLE)
|
||||
OPTION(WITH_LIBXML2_ICONV "With libxml2 using iconv" ON )
|
||||
ELSE(APPLE)
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#ifndef CL_GROUP_HTML_H
|
||||
#define CL_GROUP_HTML_H
|
||||
|
||||
#define CURL_STATICLIB 1
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include "nel/misc/types_nl.h"
|
||||
|
|
|
@ -937,21 +937,21 @@ inline CSString operator+(const CSString& s0,const CSString& s1)
|
|||
*/
|
||||
inline CSString operator+(char s0,const CSString& s1)
|
||||
{
|
||||
return CSString(s0)+s1;
|
||||
return CSString(s0) + s1.c_str();
|
||||
}
|
||||
|
||||
inline CSString operator+(const char* s0,const CSString& s1)
|
||||
{
|
||||
return CSString(s0)+s1;
|
||||
return CSString(s0) + s1.c_str();
|
||||
}
|
||||
|
||||
#ifndef NL_COMP_VC10
|
||||
#if !defined(NL_COMP_VC) || (NL_COMP_VC_VERSION <= 100)
|
||||
// TODO: check if it can be disabled for other compilers too
|
||||
inline CSString operator+(const std::string& s0,const CSString& s1)
|
||||
{
|
||||
return s0+static_cast<const std::string&>(s1);
|
||||
}
|
||||
#endif // NL_COMP_VC10
|
||||
#endif
|
||||
|
||||
} // NLMISC
|
||||
|
||||
|
|
|
@ -54,6 +54,9 @@
|
|||
# ifdef _MSC_VER
|
||||
# define NL_COMP_VC
|
||||
# if _MSC_VER >= 1700
|
||||
# define NL_COMP_VC12
|
||||
# define NL_COMP_VC_VERSION 120
|
||||
# elif _MSC_VER >= 1700
|
||||
# define NL_COMP_VC11
|
||||
# define NL_COMP_VC_VERSION 110
|
||||
# elif _MSC_VER >= 1600
|
||||
|
@ -414,7 +417,7 @@ extern void operator delete[](void *p) throw();
|
|||
# define CHashMap stdext::hash_map
|
||||
# define CHashSet stdext::hash_set
|
||||
# define CHashMultiMap stdext::hash_multimap
|
||||
#elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION == 110)
|
||||
#elif defined(NL_COMP_VC) && (NL_COMP_VC_VERSION >= 120)
|
||||
# include <hash_map>
|
||||
# include <hash_set>
|
||||
# define CHashMap ::std::hash_map
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "stdpch.h"
|
||||
#define CURL_STATICLIB 1
|
||||
#include <curl/curl.h>
|
||||
#include "http_client_curl.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue