Merge with develop

code/ryzom/client/CMakeLists.txt

@@ -10,4 +10,13 @@ IF(WITH_RYZOM_CLIENT)
   ENDIF()
 
   INSTALL(FILES client_default.cfg DESTINATION ${RYZOM_ETC_PREFIX})
+
+  IF(WITH_RYZOM_PATCH)
+    IF(APPLE)
+      INSTALL(FILES macosx/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX})
+    ELSEIF(WIN32)
+      INSTALL(FILES windows/upgd_nl.bat DESTINATION ${RYZOM_GAMES_PREFIX})
+    ELSE()
+      INSTALL(FILES unix/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX})
+    ENDIF()
 ENDIF()

code/ryzom/client/windows/upgd_nl.bat

@@ -0,0 +1,34 @@
+@echo off
+
+if "x%ROOTPATH%x" == "xx" (
+	echo upgd_nl.bat can only be launched from updt_nl.bat
+	goto end
+)
+
+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
+if exist %ROOTPATH%\msvcp100_win32.dll (
+	if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
+	copy %ROOTPATH%\msvcp100_win32.dll %ROOTPATH%\msvcp100.dll
+)
+
+if exist %ROOTPATH%\msvcr100_win32.dll (
+	if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
+	copy %ROOTPATH%\msvcr100_win32.dll %ROOTPATH%\msvcr100.dll
+)
+
+if exist %ROOTPATH%\msvcp100_win64.dll (
+	if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
+	copy %ROOTPATH%\msvcp100_win64.dll %ROOTPATH%\msvcp100.dll
+)
+
+if exist %ROOTPATH%\msvcr100_win64.dll (
+	if exist %ROOTPATH%\msvcr100.dll del %ROOTPATH%\msvcr100.dll
+	copy %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll
+)
+
+if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe (
+	copy %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
+)
+
+:end