diff --git a/Core/EmulationSettings.cpp b/Core/EmulationSettings.cpp index 5ace762a..c6fd49d4 100644 --- a/Core/EmulationSettings.cpp +++ b/Core/EmulationSettings.cpp @@ -3,10 +3,10 @@ #include "Console.h" #include "RewindManager.h" -//Version 0.9.8 +//Version 0.9.9 uint16_t EmulationSettings::_versionMajor = 0; uint8_t EmulationSettings::_versionMinor = 9; -uint8_t EmulationSettings::_versionRevision = 8; +uint8_t EmulationSettings::_versionRevision = 9; SimpleLock EmulationSettings::_lock; SimpleLock EmulationSettings::_shortcutLock; diff --git a/DependencyPacker/Properties/AssemblyInfo.cs b/DependencyPacker/Properties/AssemblyInfo.cs index 4804ea49..b314864f 100644 --- a/DependencyPacker/Properties/AssemblyInfo.cs +++ b/DependencyPacker/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Mesen")] [assembly: AssemblyProduct("DependencyPacker")] -[assembly: AssemblyCopyright("Copyright © Mesen 2019")] +[assembly: AssemblyCopyright("Copyright © Mesen 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Docs/config.toml b/Docs/config.toml index 2429616f..d325a65a 100644 --- a/Docs/config.toml +++ b/Docs/config.toml @@ -11,7 +11,7 @@ home = [ "HTML", "RSS", "JSON"] [params] themeVariant = "green" -mesenVersion = "0.9.8" +mesenVersion = "0.9.9" [[menu.shortcuts]] name = " Website" diff --git a/Docs/static/images/patreon.png b/Docs/static/images/patreon.png new file mode 100644 index 00000000..5443ec96 Binary files /dev/null and b/Docs/static/images/patreon.png differ diff --git a/Docs/themes/learn/layouts/partials/menu-footer.html b/Docs/themes/learn/layouts/partials/menu-footer.html index 1ac44059..eeca85bd 100644 --- a/Docs/themes/learn/layouts/partials/menu-footer.html +++ b/Docs/themes/learn/layouts/partials/menu-footer.html @@ -1,5 +1,6 @@ diff --git a/GUI.NET/Config/Configuration.cs b/GUI.NET/Config/Configuration.cs index 28febe93..34b97fc8 100644 --- a/GUI.NET/Config/Configuration.cs +++ b/GUI.NET/Config/Configuration.cs @@ -15,7 +15,7 @@ namespace Mesen.GUI.Config private const int MaxRecentFiles = 10; private bool _needToSave = false; - public string MesenVersion = "0.9.8"; + public string MesenVersion = "0.9.9"; public PreferenceInfo PreferenceInfo; public AudioInfo AudioInfo; public VideoInfo VideoInfo; diff --git a/GUI.NET/Dependencies/resources.ca.xml b/GUI.NET/Dependencies/resources.ca.xml index 277e6de9..8fa346e7 100644 --- a/GUI.NET/Dependencies/resources.ca.xml +++ b/GUI.NET/Dependencies/resources.ca.xml @@ -551,7 +551,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Lloc web: www.mesen.ca Versió: diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml index 695bcc07..66f6a4ee 100644 --- a/GUI.NET/Dependencies/resources.en.xml +++ b/GUI.NET/Dependencies/resources.en.xml @@ -561,7 +561,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Website: www.mesen.ca Version: diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml index efe2b786..a4e60339 100644 --- a/GUI.NET/Dependencies/resources.es.xml +++ b/GUI.NET/Dependencies/resources.es.xml @@ -549,7 +549,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Sitio web: www.mesen.ca Versión: diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml index 2f6d5d50..e247ec7d 100644 --- a/GUI.NET/Dependencies/resources.fr.xml +++ b/GUI.NET/Dependencies/resources.fr.xml @@ -561,7 +561,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Site web: www.mesen.ca Version: diff --git a/GUI.NET/Dependencies/resources.it.xml b/GUI.NET/Dependencies/resources.it.xml index 2a704434..40279101 100644 --- a/GUI.NET/Dependencies/resources.it.xml +++ b/GUI.NET/Dependencies/resources.it.xml @@ -561,7 +561,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Sito: www.mesen.ca Versione: diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml index c906827c..57e7c10a 100644 --- a/GUI.NET/Dependencies/resources.ja.xml +++ b/GUI.NET/Dependencies/resources.ja.xml @@ -549,7 +549,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) サイト: www.mesen.ca バージョン: diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml index 55e023ff..1d540832 100644 --- a/GUI.NET/Dependencies/resources.pt.xml +++ b/GUI.NET/Dependencies/resources.pt.xml @@ -561,7 +561,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Site: www.mesen.ca Versão: diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml index ea9908b7..5687bfd1 100644 --- a/GUI.NET/Dependencies/resources.ru.xml +++ b/GUI.NET/Dependencies/resources.ru.xml @@ -549,7 +549,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Сайт: www.mesen.ca Версия: diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml index a8fbe7ad..4df9f794 100644 --- a/GUI.NET/Dependencies/resources.uk.xml +++ b/GUI.NET/Dependencies/resources.uk.xml @@ -549,7 +549,7 @@
Mesen - © 2019 M. Bibaud (aka Sour) + © 2020 M. Bibaud (aka Sour) Сайт: www.mesen.ca Версiя: diff --git a/GUI.NET/Dependencies/resources.zh.xml b/GUI.NET/Dependencies/resources.zh.xml index 01eddf97..4a8da528 100644 --- a/GUI.NET/Dependencies/resources.zh.xml +++ b/GUI.NET/Dependencies/resources.zh.xml @@ -573,7 +573,7 @@
Mesen - © 2019 M. Bibaud (又名 Sour) + © 2020 M. Bibaud (又名 Sour) 网站: www.mesen.ca 版本: diff --git a/GUI.NET/Forms/frmAbout.Designer.cs b/GUI.NET/Forms/frmAbout.Designer.cs index ace1e204..88dead84 100644 --- a/GUI.NET/Forms/frmAbout.Designer.cs +++ b/GUI.NET/Forms/frmAbout.Designer.cs @@ -568,7 +568,7 @@ this.labelCopyright.Name = "labelCopyright"; this.labelCopyright.Size = new System.Drawing.Size(244, 17); this.labelCopyright.TabIndex = 21; - this.labelCopyright.Text = "© 2019 M. Bibaud (aka Sour)"; + this.labelCopyright.Text = "© 2020 M. Bibaud (aka Sour)"; this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // flowLayoutPanel1 diff --git a/GUI.NET/Properties/AssemblyInfo.cs b/GUI.NET/Properties/AssemblyInfo.cs index bb402f8c..67f65166 100644 --- a/GUI.NET/Properties/AssemblyInfo.cs +++ b/GUI.NET/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Mesen")] [assembly: AssemblyProduct("Mesen (Beta)")] -[assembly: AssemblyCopyright("Copyright © 2019 M. Bibaud")] +[assembly: AssemblyCopyright("Copyright © 2020 M. Bibaud")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.9.*")] -[assembly: AssemblyFileVersion("0.9.8.0")] +[assembly: AssemblyFileVersion("0.9.9.0")] diff --git a/PGOHelper/PGOHelper.cpp b/PGOHelper/PGOHelper.cpp index 2817a564..e3612b45 100644 --- a/PGOHelper/PGOHelper.cpp +++ b/PGOHelper/PGOHelper.cpp @@ -2,9 +2,14 @@ #include #include #include -#include +#if __has_include() + #include + namespace fs = std::filesystem; +#elif __has_include() + #include + namespace fs = std::experimental::filesystem; +#endif #include "../Core/PgoUtilities.h" -namespace fs = std::filesystem; using std::string; using std::vector; diff --git a/UpdateHelper/Properties/AssemblyInfo.cs b/UpdateHelper/Properties/AssemblyInfo.cs index 99d5da6d..1d98a686 100644 --- a/UpdateHelper/Properties/AssemblyInfo.cs +++ b/UpdateHelper/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("MesenUpdater")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright © 2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]