From c6f7afd3b90058531939ad9a640cd444171bc67c Mon Sep 17 00:00:00 2001 From: Sour Date: Sun, 5 Aug 2018 14:30:09 -0400 Subject: [PATCH] Version Update: 0.9.6 --- Core/EmulationSettings.cpp | 4 ++-- GUI.NET/Config/Configuration.cs | 2 +- GUI.NET/Properties/AssemblyInfo.cs | 2 +- TestHelper/TestHelper.cpp | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Core/EmulationSettings.cpp b/Core/EmulationSettings.cpp index 986c4432..b6cad009 100644 --- a/Core/EmulationSettings.cpp +++ b/Core/EmulationSettings.cpp @@ -3,10 +3,10 @@ #include "Console.h" #include "RewindManager.h" -//Version 0.9.5 +//Version 0.9.6 uint16_t EmulationSettings::_versionMajor = 0; uint8_t EmulationSettings::_versionMinor = 9; -uint8_t EmulationSettings::_versionRevision = 5; +uint8_t EmulationSettings::_versionRevision = 6; SimpleLock EmulationSettings::_lock; SimpleLock EmulationSettings::_shortcutLock; diff --git a/GUI.NET/Config/Configuration.cs b/GUI.NET/Config/Configuration.cs index fbbfe99f..f1967522 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.5"; + public string MesenVersion = "0.9.6"; public PreferenceInfo PreferenceInfo; public AudioInfo AudioInfo; public VideoInfo VideoInfo; diff --git a/GUI.NET/Properties/AssemblyInfo.cs b/GUI.NET/Properties/AssemblyInfo.cs index 8d10e8b8..71bb02e2 100644 --- a/GUI.NET/Properties/AssemblyInfo.cs +++ b/GUI.NET/Properties/AssemblyInfo.cs @@ -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.5.0")] +[assembly: AssemblyFileVersion("0.9.6.0")] diff --git a/TestHelper/TestHelper.cpp b/TestHelper/TestHelper.cpp index c624d585..3ee10cc2 100644 --- a/TestHelper/TestHelper.cpp +++ b/TestHelper/TestHelper.cpp @@ -30,6 +30,7 @@ using namespace std; typedef void (__stdcall *NotificationListenerCallback)(ConsoleNotificationType); extern "C" { + void __stdcall InitDll(); void __stdcall SetFlags(uint64_t flags); void __stdcall InitializeEmu(const char* homeFolder, void*, void*, bool, bool, bool); void __stdcall SetControllerType(uint32_t port, ControllerType type); @@ -189,6 +190,7 @@ int main(int argc, char* argv[]) std::getchar(); } else if(argc == 3) { char* testFilename = argv[2]; + InitDll(); SetFlags(0x8000000000000000); //EmulationFlags::ConsoleMode InitializeEmu(mesenFolder.c_str(), nullptr, nullptr, false, false, false); RegisterNotificationCallback(0, (NotificationListenerCallback)OnNotificationReceived);