From e80aac9953cb6a9841472089be7e4c54f16b3678 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 21 Sep 2016 18:04:29 +0200 Subject: [PATCH] Merge with develop --- code/ryzom/client/windows/upgd_nl.bat | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/windows/upgd_nl.bat b/code/ryzom/client/windows/upgd_nl.bat index d5a0c97c2..e0b64a5cf 100644 --- a/code/ryzom/client/windows/upgd_nl.bat +++ b/code/ryzom/client/windows/upgd_nl.bat @@ -9,26 +9,27 @@ 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 + copy /Y %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 + copy /Y %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 + copy /Y %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 + copy /Y %ROOTPATH%\msvcr100_win64.dll %ROOTPATH%\msvcr100.dll ) if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe ( - copy %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. + if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe + copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\.. ) :end