From a8674a7b8618b1f17b7abb8908ea7cd4367aa730 Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Sun, 21 Jun 2020 03:11:23 +0200
Subject: Fix: fatal error CVT1100 when compiling manifest file

Occurs when doing a local compile in MSVC build. The compiler I'm using is as below:
Microsoft Visual Studio Community 2019 Preview
Version 16.6.0 Preview 5.0

Fixes this error:
CVTRES : fatal error CVT1100: duplicate resource. type:MANIFEST, name:1, language:0x0409
LINK : fatal error LNK1123: failure during conversion to COFF: file invalid or corrupt

I have put 0 since previous name was 1. If have other names in mind, please let me know.

Co-Authored-By: dragios <dragios@users.noreply.github.com>
---
 src/yuzu_cmd/yuzu.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu_cmd')

diff --git a/src/yuzu_cmd/yuzu.rc b/src/yuzu_cmd/yuzu.rc
index 7de8ef3d9..0cde75e2f 100644
--- a/src/yuzu_cmd/yuzu.rc
+++ b/src/yuzu_cmd/yuzu.rc
@@ -14,4 +14,4 @@ YUZU_ICON               ICON                    "../../dist/yuzu.ico"
 // RT_MANIFEST
 //
 
-1                       RT_MANIFEST             "../../dist/yuzu.manifest"
+0                       RT_MANIFEST             "../../dist/yuzu.manifest"
-- 
cgit v1.2.3


From e31425df3877636c098ec7426ebd2067920715cb Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Mon, 24 Feb 2020 22:04:12 -0400
Subject: General: Recover Prometheus project from harddrive failure

This commit: Implements CPU Interrupts, Replaces Cycle Timing for Host 
Timing, Reworks the Kernel's Scheduler, Introduce Idle State and 
Suspended State, Recreates the bootmanager, Initializes Multicore 
system.
---
 src/yuzu_cmd/yuzu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu_cmd')

diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 4d2ea7e9e..1e5377840 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -237,7 +237,7 @@ int main(int argc, char** argv) {
 
     std::thread render_thread([&emu_window] { emu_window->Present(); });
     while (emu_window->IsOpen()) {
-        system.RunLoop();
+        //system.RunLoop();
     }
     render_thread.join();
 
-- 
cgit v1.2.3


From 9e4b9f1afdb93bab7640e9d04cc2e28b9c48a288 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Tue, 25 Feb 2020 10:30:23 -0400
Subject: YuzuCMD/Tester: Correct execution

---
 src/yuzu_cmd/yuzu.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/yuzu_cmd')

diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 1e5377840..38ffdfbd3 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -236,9 +236,10 @@ int main(int argc, char** argv) {
     system.Renderer().Rasterizer().LoadDiskResources();
 
     std::thread render_thread([&emu_window] { emu_window->Present(); });
-    while (emu_window->IsOpen()) {
-        //system.RunLoop();
-    }
+    system.Run();
+    while (emu_window->IsOpen())
+        ;
+    system.Pause();
     render_thread.join();
 
     system.Shutdown();
-- 
cgit v1.2.3


From dc580582034fb5937aa53176fdaa4bd0fc4acce8 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Tue, 25 Feb 2020 11:12:46 -0400
Subject: General: Setup yuzu threads' microprofile, naming and registry.

---
 src/yuzu_cmd/yuzu.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/yuzu_cmd')

diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 38ffdfbd3..e6c6a839d 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <chrono>
 #include <iostream>
 #include <memory>
 #include <string>
@@ -237,8 +238,9 @@ int main(int argc, char** argv) {
 
     std::thread render_thread([&emu_window] { emu_window->Present(); });
     system.Run();
-    while (emu_window->IsOpen())
-        ;
+    while (emu_window->IsOpen()) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    }
     system.Pause();
     render_thread.join();
 
-- 
cgit v1.2.3