diff --git a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini index feae1b62e..34508f01f 100644 --- a/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini +++ b/code/ryzom/tools/client/ryzom_installer/res/ryzom_installer.ini @@ -1,4 +1,4 @@ -version=4 +version=5 [common] installation_directory= @@ -14,18 +14,18 @@ url_help=http://app.ryzom.com/app_forum/index.php?page=topic/view/22047/1&post14 comments=Science-fantasy MMORPG [servers] -size=1 +size=3 [server_0] id=ryzom_live name=Atys display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" -files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer" -data_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_data.7z?r=&ts=$TIMESTAMP" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer¬_used_yet" +data_download_url="https://download.ryzom.com/ryzom_live_data.7z" data_download_filename=ryzom_live_data.7z data_compressed_size=1500000000 data_uncompressed_size=7000000000 -client_download_url="http://downloads.sourceforge.net/project/ryzom/installer/ryzom_live_client_$ARCH.7z?r=&ts=$TIMESTAMP" +client_download_url="https://download.ryzom.com/ryzom_live_client_$ARCH.7z" client_download_filename=ryzom_live_client_$ARCH.7z client_filename_windows=ryzom_client_r.exe client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom @@ -36,5 +36,46 @@ configuration_filename_osx=Ryzom.app/Contents/MacOS/RyzomConfiguration configuration_filename_linux=ryzom_configuration_qt comments= +[server_1] +id=ryzom_dev +name=Yubo +display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer¬_used_yet" +data_download_url="https://download.ryzom.com/ryzom_live_data.7z" +data_download_filename=ryzom_live_data.7z +data_compressed_size=1500000000 +data_uncompressed_size=7000000000 +client_download_url="https://download.ryzom.com/ryzom_live_client_$ARCH.7z" +client_download_filename=ryzom_live_client_$ARCH.7z +client_filename_windows=ryzom_client_r.exe +client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom +client_filename_linux=ryzom_client +client_filename_old_windows=client_ryzom_rd.exe +configuration_filename_windows=ryzom_configuration_qt_r.exe +configuration_filename_osx=Ryzom.app/Contents/MacOS/RyzomConfiguration +configuration_filename_linux=ryzom_configuration_qt +comments= + +[server_2] +id=ryzom_test +name=Gingo +display_url="http://app.ryzom.com/app_releasenotes/index.php?lang=$LANG" +files_list_url="https://sourceforge.net/projects/ryzom/rss?path=/installer¬_used_yet" +data_download_url="https://download.ryzom.com/ryzom_live_data.7z" +data_download_filename=ryzom_live_data.7z +data_compressed_size=1500000000 +data_uncompressed_size=7000000000 +client_download_url="https://download.ryzom.com/ryzom_live_client_$ARCH.7z" +client_download_filename=ryzom_live_client_$ARCH.7z +client_filename_windows=ryzom_client_r.exe +client_filename_osx=Ryzom.app/Contents/MacOS/Ryzom +client_filename_linux=ryzom_client +client_filename_old_windows=client_ryzom_rd.exe +configuration_filename_windows=ryzom_configuration_qt_r.exe +configuration_filename_osx=Ryzom.app/Contents/MacOS/RyzomConfiguration +configuration_filename_linux=ryzom_configuration_qt +comments= + + [profiles] size=0 diff --git a/dist/nsis/ryzom_installer.nsi b/dist/nsis/ryzom_installer.nsi index bc8e6d435..8ce975e19 100644 --- a/dist/nsis/ryzom_installer.nsi +++ b/dist/nsis/ryzom_installer.nsi @@ -102,8 +102,8 @@ Section ;Client, configuration and misc files File "${SrcDir}\${Executable}" - File "${SrcDir}\msvcp100.dll" - File "${SrcDir}\msvcr100.dll" + File "${SrcDir}\msvcp120.dll" + File "${SrcDir}\msvcr120.dll" ;Shortcut on desktop CreateShortCut "$DESKTOP\${Product}.lnk" "$INSTDIR\${Executable}"