mirror of
https://github.com/glfw/glfw.git
synced 2024-11-11 21:13:50 +00:00
Fixed mingw compile errors.
This commit is contained in:
parent
a69974403e
commit
5a16042c8a
@ -229,7 +229,7 @@ int _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, GLFWvidmode* list, int ma
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (list && maxcount)
|
if (list && maxcount)
|
||||||
memcpy(list, vidModes, sizeof(GLFWvidmode) * min(vidModesCount, maxcount));
|
memcpy(list, vidModes, sizeof(GLFWvidmode) * ((vidModesCount < maxcount) ? vidModesCount : maxcount));
|
||||||
|
|
||||||
free(vidModes);
|
free(vidModes);
|
||||||
|
|
||||||
|
@ -38,6 +38,11 @@
|
|||||||
#define EDS_ROTATEDMODE 0x00000004
|
#define EDS_ROTATEDMODE 0x00000004
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// The MinGW upstream lacks this
|
||||||
|
#ifndef DISPLAY_DEVICE_ACTIVE
|
||||||
|
#define DISPLAY_DEVICE_ACTIVE 0x00000001
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
////// GLFW platform API //////
|
////// GLFW platform API //////
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
#include <Dbt.h>
|
#include <dbt.h>
|
||||||
|
|
||||||
// This path may need to be changed if you build GLFW using your own setup
|
// This path may need to be changed if you build GLFW using your own setup
|
||||||
// We ship and use our own copy of wglext.h since GLFW uses fairly new
|
// We ship and use our own copy of wglext.h since GLFW uses fairly new
|
||||||
|
Loading…
Reference in New Issue
Block a user