Merge with develop

This commit is contained in:
kervala 2016-09-21 18:04:29 +02:00
parent 203490b838
commit e80aac9953

View file

@ -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