diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml index 536015e7..8a4f9428 100644 --- a/GUI.NET/Dependencies/resources.en.xml +++ b/GUI.NET/Dependencies/resources.en.xml @@ -37,6 +37,7 @@ The Visual Studio Runtime could not be installed properly. <empty> An error has occurred while trying to check for updates. Error details: {0} + Automatic updates are not enabled on this build - please download the latest version of the code and recompile Mesen to get the latest updates. FDS bios not found. The bios is required to run FDS games. Select bios file now? Disk {0} Side {1} File not found: {0} diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index 317f7c57..01a9d293 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -575,6 +575,7 @@ El paquete Visual C++ Redistributable para Visual Studio 2015 no se ha instalado correctamente. <No hay copia de seguridad> Se ha producido un error en la búsqueda de actualizaciones. Detalles del error: {0} + Automatic updates are not enabled on this build - please download the latest version of the code and recompile Mesen to get the latest updates. No se encontró una bios para FDS. Se requiere una bios para jugar a juegos FDS. ¿Desea seleccionar una bios manualmente? Disco {0} Cara {1} Archivo no encontrado: {0} diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index 67d414bb..7da8643a 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -590,6 +590,7 @@ Le package Redistribuable Visual C++ pour Visual Studio 2015 n'a pas été installé correctement. <aucune sauvegarde> Une erreur s'est produite lors de la recherche de mises-à-jour. Détails de l'erreur : {0} + Les mises-à-jour automatiques ne sont pas disponibles avec votre build - s.v.p télécharger la dernière version du code et recompiler Mesen pour avoir accès à la version la plus récente. Un bios pour le FDS n'a pas été trouvé. Le bios est requis pour jouer à des jeux de FDS. Voulez-vous sélectionnez un bios maintenant? Disque {0} Côté {1} Fichier non trouvé: {0} diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index 4880cae8..b4bb345b 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -573,6 +573,7 @@ Microsoft Visual Studio 2015のVisual C++再頒布可能パッケージはインストールできませんでした。 <なし> アップデートを確認する時にエラーが発生しました。 エラーの詳細: {0} + このビルドでは自動更新は出来ません。最新版を使うためにはコードの最新版をダウンロードしてビルドしてください。 ファミコンディスクシステム(FDS)のゲームをロードするためにFDSのBIOSファイルは必要です。 FDSのBIOSファイルを選びますか？ ディスク{0} {1}面 ファイルが見つかりません: {0} diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 648d700b..7b0f4e6c 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -575,6 +575,7 @@ O pacote Visual C++ Redistributable para Visual Studio 2015 não foi instalado corretamente. <Não há State> Houve um erro na busca por atualizações. Detalhes do erro: {0} + Automatic updates are not enabled on this build - please download the latest version of the code and recompile Mesen to get the latest updates. Não foi encontrada uma bios para FDS. É preciso de uma bios para jogos do FDS. Deseja selecionar uma bios manualmente? Disco {0} Cara {1} Arquivo não encontrado: {0} diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index 994caf6e..0a634bc0 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -581,6 +581,7 @@ The Visual Studio Runtime не установлен. <пусто> Ошибка при проверке обновлений. Подробно: {0} + Automatic updates are not enabled on this build - please download the latest version of the code and recompile Mesen to get the latest updates. FDS BIOS не найден. BIOS необходим для запуска FDS игр. Выбрать BIOS сейчас? Диск {0} Сторона {1} Файл не найден: {0} diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index b0fb82c6..b0c687e8 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -580,6 +580,7 @@ The Visual Studio Runtime не встановлений. <пусто> Не вдалося перевірити оновлення. Детально: {0} + Automatic updates are not enabled on this build - please download the latest version of the code and recompile Mesen to get the latest updates. FDS BIOS не знайдений. BIOS необхідний для запуску FDS игр. Вибрати BIOS зараз? Диск {0} Сторона {1} Файл не знайдено: {0} diff --git a/GUI.NET/Forms/frmUpdatePrompt.cs b/GUI.NET/Forms/frmUpdatePrompt.cs index 32a9ae8b..dd129681 100644 --- a/GUI.NET/Forms/frmUpdatePrompt.cs +++ b/GUI.NET/Forms/frmUpdatePrompt.cs @@ -55,6 +55,11 @@ namespace Mesen.GUI.Forms private void btnUpdate_Click(object sender, EventArgs e) { +#if DISABLEAUTOUPDATE + MesenMsgBox.Show("AutoUpdateDisabledMessage", MessageBoxButtons.OK, MessageBoxIcon.Information); + this.DialogResult = DialogResult.Cancel; + this.Close(); +#else string destFilePath = System.Reflection.Assembly.GetEntryAssembly().Location; string srcFilePath = Path.Combine(ConfigManager.DownloadFolder, "Mesen." + lblLatestVersionString.Text + ".exe"); string backupFilePath = Path.Combine(ConfigManager.BackupFolder, "Mesen." + lblCurrentVersionString.Text + ".exe"); @@ -80,6 +85,7 @@ namespace Mesen.GUI.Forms } } } +#endif } private string GetSha1Hash(string filename) diff --git a/makefile b/makefile index 33eb9697..3c9a95ca 100644 --- a/makefile +++ b/makefile @@ -44,7 +44,7 @@ ui: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) cp GUI.NET/Dependencies/* $(RELEASEFOLDER)/Dependencies/ cp InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) $(RELEASEFOLDER)/Dependencies/$(SHAREDLIB) cd $(RELEASEFOLDER)/Dependencies && zip ../Dependencies.zip * - cd GUI.NET && xbuild /property:Configuration="Release" /property:Platform="$(MESENPLATFORM)" /property:PreBuildEvent="" /property:DefineConstants="HIDETESTMENU" + cd GUI.NET && xbuild /property:Configuration="Release" /property:Platform="$(MESENPLATFORM)" /property:PreBuildEvent="" /property:DefineConstants="HIDETESTMENU;DISABLEAUTOUPDATE" core: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB)