Fix compilation with VC++2015
parent
55684d195a
commit
ae31662a96
|
@ -13,7 +13,9 @@
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
|
||||||
#define BROKEN_FRIEND_TEMPLATES
|
#define BROKEN_FRIEND_TEMPLATES
|
||||||
|
#if _MSC_VER < 1700
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
|
#endif
|
||||||
|
|
||||||
#if _MSC_VER >= 1000
|
#if _MSC_VER >= 1000
|
||||||
// Make VC shut up about long variable names from templates
|
// Make VC shut up about long variable names from templates
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "glext.h"
|
#include "glext.h"
|
||||||
#include "shadermanager.h"
|
#include "shadermanager.h"
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
#include <algorithm> // for min & max
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#endif /* ! TARGET_OS_MAC */
|
#endif /* ! TARGET_OS_MAC */
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
|
|
||||||
|
#include <algorithm> // for min & max
|
||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
#include <celutil/debug.h>
|
#include <celutil/debug.h>
|
||||||
#include <celmath/mathlib.h>
|
#include <celmath/mathlib.h>
|
||||||
|
|
|
@ -1859,7 +1859,7 @@ bool SetDCPixelFormat(HDC hDC)
|
||||||
PFD_SUPPORT_OPENGL | // Support OpenGL calls in window
|
PFD_SUPPORT_OPENGL | // Support OpenGL calls in window
|
||||||
PFD_DOUBLEBUFFER, // Double buffered mode
|
PFD_DOUBLEBUFFER, // Double buffered mode
|
||||||
PFD_TYPE_RGBA, // RGBA Color mode
|
PFD_TYPE_RGBA, // RGBA Color mode
|
||||||
GetDeviceCaps(hDC, BITSPIXEL),// Want the display bit depth
|
(BYTE)GetDeviceCaps(hDC, BITSPIXEL),// Want the display bit depth
|
||||||
0,0,0,0,0,0, // Not used to select mode
|
0,0,0,0,0,0, // Not used to select mode
|
||||||
0,0, // Not used to select mode
|
0,0, // Not used to select mode
|
||||||
0,0,0,0,0, // Not used to select mode
|
0,0,0,0,0, // Not used to select mode
|
||||||
|
|
|
@ -32,12 +32,22 @@ lpfnSetLayeredWindowAttributes winSetLayeredWindowAttributes = NULL;
|
||||||
lpfnUpdateLayeredWindow winUpdateLayeredWindow = NULL;
|
lpfnUpdateLayeredWindow winUpdateLayeredWindow = NULL;
|
||||||
|
|
||||||
#define WS_EX_LAYERED 0x00080000
|
#define WS_EX_LAYERED 0x00080000
|
||||||
|
#ifndef LWA_COLORKEY
|
||||||
#define LWA_COLORKEY 1
|
#define LWA_COLORKEY 1
|
||||||
|
#endif
|
||||||
|
#ifndef LWA_ALPHA
|
||||||
#define LWA_ALPHA 2
|
#define LWA_ALPHA 2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ULW_COLORKEY
|
||||||
#define ULW_COLORKEY 1
|
#define ULW_COLORKEY 1
|
||||||
|
#endif
|
||||||
|
#ifndef ULW_ALPHA
|
||||||
#define ULW_ALPHA 2
|
#define ULW_ALPHA 2
|
||||||
|
#endif
|
||||||
|
#ifndef ULW_OPAQUE
|
||||||
#define ULW_OPAQUE 4
|
#define ULW_OPAQUE 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static LRESULT CALLBACK SplashWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static LRESULT CALLBACK SplashWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include "formatnum.h"
|
#include "formatnum.h"
|
||||||
|
|
||||||
// HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
|
// HACK: MS Visual C++ has _snprintf declared in stdio.h but not snprintf
|
||||||
#ifdef _WIN32
|
#if defined(_MSC_VER) && _MSC_VER < 1700
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue