Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/client/windows/upgd_nl.bat

@@ -6,7 +6,7 @@ if "x%ROOTPATH%x" == "xx" (
 )
 
 rem We used this hack because to client 2.1 to 3.0 patch,
-rem MSVC10 DLLs are using the same name and are deleted during patch
+rem VC++ 2010 DLLs are using the same name and are deleted during patch
 if exist %ROOTPATH%\msvcp100_win32.dll (
 	if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
 	copy /Y %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll
@@ -27,6 +27,27 @@ if exist %ROOTPATH%\msvcr100_win64.dll (
 	copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll
 )
 
+rem VC++ 2013 now
+if exist %ROOTPATH%\msvcp120_win32.dll (
+	if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll
+	copy /Y %ROOTPATH%\msvcp120_win32.dll %ROOTPATH%\msvcp120.dll
+)
+
+if exist %ROOTPATH%\msvcr120_win32.dll (
+	if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll
+	copy /Y %ROOTPATH%\msvcr120_win32.dll %ROOTPATH%\msvcr120.dll
+)
+
+if exist %ROOTPATH%\msvcp120_win64.dll (
+	if exist %ROOTPATH%\msvcp120.dll del %ROOTPATH%\msvcp120.dll
+	copy /Y %ROOTPATH%\msvcp120_win64.dll %ROOTPATH%\msvcp120.dll
+)
+
+if exist %ROOTPATH%\msvcr120_win64.dll (
+	if exist %ROOTPATH%\msvcr120.dll del %ROOTPATH%\msvcr120.dll
+	copy /Y %ROOTPATH%\msvcr120_win64.dll %ROOTPATH%\msvcr120.dll
+)
+
 if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe (
 	if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe
 	copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
@@ -34,6 +55,10 @@ if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe (
 	copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\..
 	if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll
 	copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\..
+	if exist %ROOTPATH%\..\msvcp120.dll del %ROOTPATH%\..\msvcp120.dll
+	copy /Y %ROOTPATH%\msvcp120.dll %ROOTPATH%\..
+	if exist %ROOTPATH%\..\msvcr120.dll del %ROOTPATH%\..\msvcr120.dll
+	copy /Y %ROOTPATH%\msvcr120.dll %ROOTPATH%\..
 )
 
 :end