From b6c4d5792ba33ec1025041ed97b57bbbe00bafc7 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Sat, 6 Jun 2015 14:52:09 +0200 Subject: Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before." This reverts commit ba664b3293e88ddee94a4b922ced192f3270b569. Added documentation to Core::Shutdown() to prevent breaking changes. --- Source/Core/DolphinWX/MainNoGUI.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/DolphinWX/MainNoGUI.cpp') diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 1f559b9f88..5d50423f0a 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -358,6 +358,7 @@ int main(int argc, char* argv[]) while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) updateMainFrameEvent.Wait(); + Core::Shutdown(); platform->Shutdown(); UICommon::Shutdown(); -- cgit v1.2.3 From a11ae2cf300a8049f72ce523f1daac0dc4a49faa Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 4 Sep 2015 02:14:10 -0400 Subject: CommonFuncs: Remove SLEEP macro There's already a function in Thread for this. --- Source/Core/DolphinWX/MainNoGUI.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/DolphinWX/MainNoGUI.cpp') diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 5d50423f0a..5b46e207e5 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "Common/CommonTypes.h" #include "Common/Event.h" -- cgit v1.2.3 From cc036ca86cdaf709e01221975da734cb64d54a94 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 26 Sep 2015 17:13:07 -0400 Subject: Common: Remove other Common prefixed headers from Common.h --- Source/Core/DolphinWX/MainNoGUI.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'Source/Core/DolphinWX/MainNoGUI.cpp') diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 5b46e207e5..70f099deb7 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -11,6 +11,7 @@ #include "Common/CommonTypes.h" #include "Common/Event.h" +#include "Common/MsgHandler.h" #include "Common/Logging/LogManager.h" #include "Core/BootManager.h" -- cgit v1.2.3