aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 04:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Make 2 different upgd_nl.bat depending on compiler

Browse source
This commit is contained in:
kervala 2016-12-18 13:58:20 +01:00
parent 5756137e9f
commit 33983dec8d
3 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/client/CMakeLists.txt
View file

@ -15,7 +15,11 @@ IF(WITH_RYZOM_CLIENT)
IF(APPLE) IF(APPLE)
INSTALL(FILES macosx/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX}) INSTALL(FILES macosx/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX})
ELSEIF(WIN32) ELSEIF(WIN32)
INSTALL(FILES windows/upgd_nl.bat DESTINATION ${RYZOM_GAMES_PREFIX}) IF(MSVC10)
INSTALL(FILES windows/upgd_nl_msvc10.bat DESTINATION ${RYZOM_GAMES_PREFIX} RENAME upgd_nl.bat)
ELSEIF(MSVC12)
INSTALL(FILES windows/upgd_nl_msvc12.bat DESTINATION ${RYZOM_GAMES_PREFIX} RENAME upgd_nl.bat)
ENDIF()
ELSE() ELSE()
INSTALL(FILES unix/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX}) INSTALL(FILES unix/upgd_nl.sh DESTINATION ${RYZOM_GAMES_PREFIX})
ENDIF() ENDIF()

25
code/ryzom/client/windows/upgd_nl.bat → code/ryzom/client/windows/upgd_nl_msvc10.bat
View file

@ -27,27 +27,6 @@ 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%\..
@ -55,10 +34,6 @@ 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

39
code/ryzom/client/windows/upgd_nl_msvc12.bat Normal file
View file

@ -0,0 +1,39 @@
@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 VC++ 2013 DLLs are using the same name and are deleted during patch
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%\..
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