Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Visual Studio 2013 compilation support for Ryzom Client

Browse source 
--HG--
branch : develop
This commit is contained in:
kaetemi 2015-02-20 18:10:06 +01:00
parent 2667c5d8a2
commit a8db3b2dda
6 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/CMakeLists.txt
View file

@ -156,9 +156,11 @@ IF(WITH_NEL)
FIND_PACKAGE(Luabind REQUIRED) FIND_PACKAGE(Luabind REQUIRED)
FIND_PACKAGE(CURL 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) 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) IF(CURL_STATIC)
SET(CURL_DEFINITIONS -DCURL_STATICLIB) SET(CURL_DEFINITIONS -DCURL_STATICLIB)

5
code/CMakeModules/nel.cmake
View file

@ -255,6 +255,11 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
ELSE(WITH_STATIC) ELSE(WITH_STATIC)
OPTION(WITH_STATIC_LIBXML2 "With static libxml2" OFF) OPTION(WITH_STATIC_LIBXML2 "With static libxml2" OFF)
ENDIF(WITH_STATIC) 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) IF(APPLE)
OPTION(WITH_LIBXML2_ICONV "With libxml2 using iconv" ON ) OPTION(WITH_LIBXML2_ICONV "With libxml2 using iconv" ON )
ELSE(APPLE) ELSE(APPLE)

1
code/nel/include/nel/gui/group_html.h
View file

@ -17,7 +17,6 @@
#ifndef CL_GROUP_HTML_H #ifndef CL_GROUP_HTML_H
#define CL_GROUP_HTML_H #define CL_GROUP_HTML_H
#define CURL_STATICLIB 1
#include <curl/curl.h> #include <curl/curl.h>
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"

8
code/nel/include/nel/misc/sstring.h
View file

@ -937,21 +937,21 @@ inline CSString operator+(const CSString& s0,const CSString& s1)
*/ */
inline CSString operator+(char 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) 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 // TODO: check if it can be disabled for other compilers too
inline CSString operator+(const std::string& s0,const CSString& s1) inline CSString operator+(const std::string& s0,const CSString& s1)
{ {
return s0+static_cast<const std::string&>(s1); return s0+static_cast<const std::string&>(s1);
} }
#endif // NL_COMP_VC10 #endif
} // NLMISC } // NLMISC

5
code/nel/include/nel/misc/types_nl.h
View file

@ -54,6 +54,9 @@
# ifdef _MSC_VER # ifdef _MSC_VER
# define NL_COMP_VC # define NL_COMP_VC
# if _MSC_VER >= 1700 # 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_VC11
# define NL_COMP_VC_VERSION 110 # define NL_COMP_VC_VERSION 110
# elif _MSC_VER >= 1600 # elif _MSC_VER >= 1600
@ -414,7 +417,7 @@ extern void operator delete[](void *p) throw();
# define CHashMap stdext::hash_map # define CHashMap stdext::hash_map
# define CHashSet stdext::hash_set # define CHashSet stdext::hash_set
# define CHashMultiMap stdext::hash_multimap # 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_map>
# include <hash_set> # include <hash_set>
# define CHashMap ::std::hash_map # define CHashMap ::std::hash_map

1
code/ryzom/client/src/http_client_curl.cpp
View file

@ -15,7 +15,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h" #include "stdpch.h"
#define CURL_STATICLIB 1
#include <curl/curl.h> #include <curl/curl.h>
#include "http_client_curl.h" #include "http_client_curl.h"