aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-10 01:09:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-12-15 21:12:19 +01:00
parent ae32111ea2
commit 487a6eacfa
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
code/ryzom/client/windows/upgd_nl.bat
View file

@ -6,7 +6,7 @@ if "x%ROOTPATH%x" == "xx" (
) )
rem We used this hack because to client 2.1 to 3.0 patch, 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_win32.dll (
if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll if exist %ROOTPATH%\msvcp100.dll del %ROOTPATH%\msvcp100.dll
copy /Y %ROOTPATH%\msvcp100_win32.dll %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 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 (
if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %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%\.. 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%\.. copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\..
if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll
copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\.. 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 :end