From bd8a606341041f5e30413d490ea37e3122ef809c Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 24 Jul 2013 18:47:04 +0200 Subject: [PATCH 1/8] Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) --- code/nel/include/nel/misc/types_nl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/nel/include/nel/misc/types_nl.h b/code/nel/include/nel/misc/types_nl.h index 6485960f7..ce9d88bae 100644 --- a/code/nel/include/nel/misc/types_nl.h +++ b/code/nel/include/nel/misc/types_nl.h @@ -104,6 +104,8 @@ // Windows 64bits platform SDK compilers doesn't support inline assembler # define NL_NO_ASM # endif +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0600 // force VISTA minimal version in 64 bits # endif // define NOMINMAX to be sure that windows includes will not define min max macros, but instead, use the stl template # define NOMINMAX From dfbf2998b08c0c876e3748cae705c03539855946 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 24 Jul 2013 18:47:50 +0200 Subject: [PATCH 2/8] Fixed: lua_open() doesn't exist with Lua 5.2 --- code/nel/src/gui/lua_helper.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/nel/src/gui/lua_helper.cpp b/code/nel/src/gui/lua_helper.cpp index 16dca8d7a..fb9466b36 100644 --- a/code/nel/src/gui/lua_helper.cpp +++ b/code/nel/src/gui/lua_helper.cpp @@ -197,6 +197,8 @@ namespace NLGUI { #ifdef LUA_NEVRAX_VERSION _State = lua_open(l_realloc_func, l_free_func); + #elif defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501 + _State = luaL_newstate(); #else _State = lua_open(); #endif From 199ead59881bcabdfcf262d06508f92e728e3523 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 24 Jul 2013 20:51:26 +0200 Subject: [PATCH 3/8] EOL --- .../data/gamedev/interfaces_v3/login_main.xml | 1674 ++++++++--------- 1 file changed, 837 insertions(+), 837 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml index 9d3ff0052..648cbbb6a 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml @@ -1,837 +1,837 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -