Merge remote-tracking branch 'shuffle2/vc12'

Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters

Source/Core/Common/Src/StdConditionVariable.h

@@ -25,6 +25,11 @@
 #include <condition_variable>
 #define _(s) wxGetTranslation((s))
 
+#elif _MSC_VER >= 1700
+
+// The standard implementation is included since VS2012
+#include <condition_variable>
+
 #else
 
 // partial std::condition_variable implementation for win32/pthread

Source/Core/Common/Src/StdMutex.h

@@ -15,6 +15,12 @@
 #elif __has_include(<mutex>) && !ANDROID
 // Clang + libc++
 #include <mutex>
+
+#elif _MSC_VER >= 1700
+
+// The standard implementation is included since VS2012
+#include <mutex>
+
 #else
 
 // partial <mutex> implementation for win32/pthread

Source/Core/Common/Src/StdThread.h

@@ -18,6 +18,12 @@
 #elif __has_include(<thread>) && !ANDROID
 // Clang + libc++
 #include <thread>
+
+#elif _MSC_VER >= 1700
+
+// The standard implementation is included since VS2012
+#include <thread>
+
 #else
 
 // partial std::thread implementation for win32/pthread

Source/Core/Common/Src/stdafx.h

@@ -4,18 +4,20 @@
 
 #pragma once
 
+/*
 #ifndef _WIN32_WINNT
 	#define _WIN32_WINNT 0x501
 #endif
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0500       // Default value is 0x0400
 #endif
+*/
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-
+/*
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_NONSTDC_NO_DEPRECATE 1
-
+*/
 #include <windows.h>
 #include <tchar.h>
 #include <vector>