From 570071a8b639176350fb0c885be939cfd970d691 Mon Sep 17 00:00:00 2001
From: daco65 <daco65@gmail.com>
Date: Mon, 22 Sep 2008 11:42:52 +0000
Subject: [PATCH] minor core fixing. moved CatchUpGPU() back to
 CommandProcessor so that MP1 (and more?) have graphics again. also fixed the
 lzo.lib error some ppl get (i think)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@608 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Core.vcproj                 | 11 +++++++----
 Source/Core/Core/Src/Core.cpp                | 15 +++++++--------
 Source/Core/Core/Src/HW/CommandProcessor.cpp |  2 +-
 Source/Core/Core/Src/HW/SystemTimers.cpp     |  2 --
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index 97719f6257..129f50ce57 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="Core"
 	ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"
 	RootNamespace="Core"
@@ -70,6 +70,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="$(OutDir)/Core.lib"
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -140,6 +141,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="$(OutDir)/Core.lib"
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -213,8 +215,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 				OutputFile="$(OutDir)/Core.lib"
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -290,9 +292,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 				OutputFile="$(OutDir)/Core.lib"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -366,6 +367,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="$(OutDir)/Core.lib"
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -439,6 +441,7 @@
 			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="$(OutDir)/Core.lib"
+				AdditionalLibraryDirectories="&quot;..\..\..\Externals\LZO\$(OutDir)\lzo.lib&quot;"
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index d165b0967b..10c65eafe9 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -341,15 +341,16 @@ THREAD_RETURN EmuThread(void *pArg)
 	//CPU thread should in this case also create the emuwindow...
 
 	//Spawn the CPU thread
-     Common::Thread *cpuThread = new Common::Thread(CpuThread, pArg);
-
+	Common::Thread *cpuThread = NULL;
 	//////////////////////////////////////////////////////////////////////////
 	// ENTER THE VIDEO THREAD LOOP
 	//////////////////////////////////////////////////////////////////////////
 	
 	if (!Core::GetStartupParameter().bUseDualCore)
 	{
-		Common::SetCurrentThreadName("Idle thread");
+#ifdef _WIN32
+		cpuThread = new Common::Thread(CpuThread, pArg);
+		//Common::SetCurrentThreadName("Idle thread");
 		//TODO(ector) : investigate using GetMessage instead .. although
 		//then we lose the powerdown check. ... unless powerdown sends a message :P
 		while (PowerPC::state != PowerPC::CPU_POWERDOWN)
@@ -357,18 +358,16 @@ THREAD_RETURN EmuThread(void *pArg)
 			if (Callback_PeekMessages) {
 				Callback_PeekMessages();
 			}
-#ifdef _WIN32
 			Common::SleepCurrentThread(20);
-#else
-			Common::SleepCurrentThread(200);
-#endif
 		}
-
+#else
 		// In single-core mode, the Emulation main thread is also the CPU thread
 		CpuThread(pArg);
+#endif
 	}
 	else
 	{
+		cpuThread = new Common::Thread(CpuThread, pArg);
         PluginVideo::Video_Prepare(); //wglMakeCurrent
 		Common::SetCurrentThreadName("Video thread");
 		PluginVideo::Video_EnterLoop();
diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp
index 727af87295..9fa506b16c 100644
--- a/Source/Core/Core/Src/HW/CommandProcessor.cpp
+++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp
@@ -472,7 +472,7 @@ void UpdateFifoRegister()
 #ifdef _WIN32
 	if (Core::g_CoreStartupParameter.bUseDualCore) LeaveCriticalSection(&fifo.sync);
 #endif
-//	if (!Core::g_CoreStartupParameter.bUseDualCore) CatchUpGPU();
+	if (!Core::g_CoreStartupParameter.bUseDualCore) CatchUpGPU();
 }
 
 void UpdateInterrupts()
diff --git a/Source/Core/Core/Src/HW/SystemTimers.cpp b/Source/Core/Core/Src/HW/SystemTimers.cpp
index eb9dc676c4..0a561e8988 100644
--- a/Source/Core/Core/Src/HW/SystemTimers.cpp
+++ b/Source/Core/Core/Src/HW/SystemTimers.cpp
@@ -23,7 +23,6 @@
 #include "../HW/DSP.h"
 #include "../HW/AudioInterface.h"
 #include "../HW/VideoInterface.h"
-#include "../HW/CommandProcessor.h"
 #include "../HW/SerialInterface.h"
 #include "../PowerPC/PowerPC.h"
 #include "../CoreTiming.h"
@@ -160,7 +159,6 @@ void AdvanceCallback(int cyclesExecuted)
 
 void GPUCallback(u64 userdata, int cyclesLate)
 {
-	CommandProcessor::CatchUpGPU();
 	CoreTiming::ScheduleEvent(GPU_PERIOD-cyclesLate, et_GPU);
 }