Merge pull request #2924 from thedax/master

Add initial support for native Visual Studio 2012(and above) compilation.
This commit is contained in:
Henrik Rydgård 2013-07-26 12:03:21 -07:00
commit cc8bba1b10
3 changed files with 19 additions and 3 deletions

View File

@ -18,8 +18,15 @@
#pragma once
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x501
#endif
#if _MSC_VER < 1700
#define _WIN32_WINNT 0x501 // Compile for XP on Visual Studio 2010 and below
#else
#define _WIN32_WINNT 0x600 // Compile for Vista on Visual Studio 2012 and above
#endif // #if _MSC_VER < 1700
#endif // #ifndef _WIN32_WINNT
#ifndef _WIN32_IE
#define _WIN32_IE 0x0500 // Default value is 0x0400
#endif

View File

@ -15,6 +15,9 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
// Has to be included before TextureScaler.h, else we get those std::bind errors in VS2012..
#include "../native/base/basictypes.h"
#include "TextureScaler.h"
#include "Core/Config.h"

View File

@ -26,7 +26,13 @@
//#ifdef WINDOWS
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x600
#if _MSC_VER < 1700
#define _WIN32_WINNT 0x501 // Compile for XP on Visual Studio 2010 and below
#else
#define _WIN32_WINNT 0x600 // Compile for Vista on Visual Studio 2012 and above
#endif
#undef WINVER
#define WINVER 0x0600
#ifndef _WIN32_IE