mirror of
https://github.com/libretro/ppsspp.git
synced 2025-02-01 22:31:58 +00:00
Merge pull request #2924 from thedax/master
Add initial support for native Visual Studio 2012(and above) compilation.
This commit is contained in:
commit
cc8bba1b10
@ -18,8 +18,15 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifndef _WIN32_WINNT
|
#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
|
#ifndef _WIN32_IE
|
||||||
#define _WIN32_IE 0x0500 // Default value is 0x0400
|
#define _WIN32_IE 0x0500 // Default value is 0x0400
|
||||||
#endif
|
#endif
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
// Official git repository and contact information can be found at
|
// Official git repository and contact information can be found at
|
||||||
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
// 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 "TextureScaler.h"
|
||||||
|
|
||||||
#include "Core/Config.h"
|
#include "Core/Config.h"
|
||||||
|
@ -26,7 +26,13 @@
|
|||||||
//#ifdef WINDOWS
|
//#ifdef WINDOWS
|
||||||
|
|
||||||
#undef _WIN32_WINNT
|
#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
|
#undef WINVER
|
||||||
#define WINVER 0x0600
|
#define WINVER 0x0600
|
||||||
#ifndef _WIN32_IE
|
#ifndef _WIN32_IE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user