From b4d28cfbdce241e4a849dd49eb78454499bbb3cb Mon Sep 17 00:00:00 2001 From: Sour Date: Sat, 26 Oct 2019 19:54:19 -0400 Subject: [PATCH] Version Update: 0.3.0 --- Core/EmuSettings.cpp | 4 ++-- InteropDLL/EmuApiWrapper.cpp | 13 +++++-------- UI/Config/Configuration.cs | 2 +- UI/Properties/AssemblyInfo.cs | 4 ++-- buildPGO.sh | 7 +++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Core/EmuSettings.cpp b/Core/EmuSettings.cpp index e1b858f..396f9ff 100644 --- a/Core/EmuSettings.cpp +++ b/Core/EmuSettings.cpp @@ -17,9 +17,9 @@ EmuSettings::EmuSettings(Console* console) uint32_t EmuSettings::GetVersion() { - //Version 0.2.0 + //Version 0.3.0 uint16_t major = 0; - uint8_t minor = 2; + uint8_t minor = 3; uint8_t revision = 0; return (major << 16) | (minor << 8) | revision; } diff --git a/InteropDLL/EmuApiWrapper.cpp b/InteropDLL/EmuApiWrapper.cpp index a82b515..f00c088 100644 --- a/InteropDLL/EmuApiWrapper.cpp +++ b/InteropDLL/EmuApiWrapper.cpp @@ -264,16 +264,13 @@ extern "C" { _console->Initialize(); _console->LoadRom((VirtualFile)testRoms[i], VirtualFile()); - thread testThread([=] { - if(enableDebugger) { - //turn on debugger to profile the debugger's code too - _console->GetDebugger(); - } - _console->Run(); - }); + if(enableDebugger) { + //turn on debugger to profile the debugger's code too + _console->GetDebugger(); + } + std::this_thread::sleep_for(std::chrono::duration(5000)); _console->Stop(false); - testThread.join(); _console->Release(); } } diff --git a/UI/Config/Configuration.cs b/UI/Config/Configuration.cs index 7011f75..68bbdbf 100644 --- a/UI/Config/Configuration.cs +++ b/UI/Config/Configuration.cs @@ -14,7 +14,7 @@ namespace Mesen.GUI.Config { private bool _needToSave = false; - public string Version = "0.2.0"; + public string Version = "0.3.0"; public VideoConfig Video; public AudioConfig Audio; public InputConfig Input; diff --git a/UI/Properties/AssemblyInfo.cs b/UI/Properties/AssemblyInfo.cs index d0e8a75..7403b0e 100644 --- a/UI/Properties/AssemblyInfo.cs +++ b/UI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.*")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.3.*")] +[assembly: AssemblyFileVersion("0.3.0.0")] diff --git a/buildPGO.sh b/buildPGO.sh index 3bebdb5..2b34f52 100644 --- a/buildPGO.sh +++ b/buildPGO.sh @@ -13,7 +13,7 @@ # # Note: While GCC runs through this script just fine, the runtime performance is pretty terrible (something must be wrong with the way this is built) # -# This will produce the following binary: bin/x64/Release/Mesen.exe +# This will produce the following binary: bin/x64/Release/Mesen-S.exe if [ "$MESENPLATFORM" = x86 ]; then PLAT="x86" else @@ -27,13 +27,12 @@ else fi OBJ="PGOHelper/obj.${PLAT}/" -FLAGS="LTO=true MESENPLATFORM=${PLAT}" +FLAGS="LTO=true STATICLINK=true MESENPLATFORM=${PLAT}" eval ${FLAGS} make clean #create instrumented binary -eval ${FLAGS} PGO=profile make ${TARG} -j 16 -eval ${FLAGS} PGO=profile make pgohelper -B +eval ${FLAGS} PGO=profile make pgohelper -B -j 16 eval cp bin/pgohelperlib.so ${OBJ} #run the instrumented binary