From 0b609b72fb3b01512605a651d07e9f8210b38d6b Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 12 Nov 2013 18:26:32 -0500 Subject: [PATCH 1/3] Fix Windows build. --- Common/Common.vcxproj | 4 +--- Common/Common.vcxproj.filters | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 447c5861ec..68f9eecc57 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -192,7 +192,6 @@ - @@ -228,7 +227,6 @@ Create - @@ -246,4 +244,4 @@ - + \ No newline at end of file diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters index 62a187b5f0..103d3a1c8f 100644 --- a/Common/Common.vcxproj.filters +++ b/Common/Common.vcxproj.filters @@ -23,7 +23,6 @@ - @@ -53,7 +52,6 @@ - @@ -78,4 +76,4 @@ {1b593f03-7b28-4707-9228-4981796f5589} - + \ No newline at end of file From d56114e30dbf2b5daf000485f32933033ba51a0c Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 12 Nov 2013 18:37:06 -0500 Subject: [PATCH 2/3] Fix VS2013. --- Core/HLE/sceDisplay.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 6cf967ea9a..060fd6887c 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -18,6 +18,7 @@ #include #include #include +#include // TODO: Move the relevant parts into common. Don't want the core // to be dependent on "native", I think. Or maybe should get rid of common From 563ab40cd5e073bc8ff1a416ab390b8412486c48 Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 12 Nov 2013 18:41:22 -0500 Subject: [PATCH 3/3] Remove include. --- Windows/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Windows/main.cpp b/Windows/main.cpp index 939a035a47..083a8623c2 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp @@ -30,7 +30,6 @@ #include "Common/LogManager.h" #include "Common/ConsoleListener.h" -#include "Common/Thread.h" #include "Commctrl.h"