From e8263523a8e42b0377c9e2e53d87fa00e969064b Mon Sep 17 00:00:00 2001 From: The Dax Date: Tue, 17 Sep 2013 15:13:02 -0400 Subject: [PATCH] Build fix for VS 2012. --- GPU/Directx9/TextureScalerDX9.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GPU/Directx9/TextureScalerDX9.cpp b/GPU/Directx9/TextureScalerDX9.cpp index f06fee7416..cd906a7e17 100644 --- a/GPU/Directx9/TextureScalerDX9.cpp +++ b/GPU/Directx9/TextureScalerDX9.cpp @@ -15,6 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. +// On Visual Studio 2012, include this before anything else so +// _VARIADIC_MAX gets set to 10, to avoid std::bind compile errors. +// See header file for reasons why. +#if defined(_WIN32) && _MSC_VER == 1700 +#include "../native/base/basictypes.h" +#endif + #include "GPU/Directx9/TextureScalerDX9.h" #include "Core/Config.h"