From 77c4520ce31e5a22a803b2e184d646865b15599a Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 15 Dec 2016 21:11:27 +0100 Subject: [PATCH] Changed: Support VC++ 2013 DLLs --- code/ryzom/client/windows/upgd_nl.bat | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/code/ryzom/client/windows/upgd_nl.bat b/code/ryzom/client/windows/upgd_nl.bat index ad19c2497..60ae2987c 100644 --- a/code/ryzom/client/windows/upgd_nl.bat +++ b/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