Allowing recent change to build on older versions of MSVC per e-mail from Eero Pajarre dated 1/31/10 at 10:00 AM
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@875 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
70d3a84fbb
commit
142e76b216
@ -827,6 +827,7 @@ void fgSetWindow ( SFG_Window *window )
|
|||||||
|
|
||||||
#if TARGET_HOST_MS_WINDOWS
|
#if TARGET_HOST_MS_WINDOWS
|
||||||
|
|
||||||
|
#if(WINVER >= 0x500)
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int *x;
|
int *x;
|
||||||
int *y;
|
int *y;
|
||||||
@ -859,7 +860,7 @@ static BOOL CALLBACK m_proc(HMONITOR mon,
|
|||||||
* this function is only used in fgOpenWindow. Currently it only sets
|
* this function is only used in fgOpenWindow. Currently it only sets
|
||||||
* its output parameters, if the DisplayName is set in fgDisplay
|
* its output parameters, if the DisplayName is set in fgDisplay
|
||||||
* (and if it is able to recognize the display)
|
* (and if it is able to recognize the display)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void get_display_origin(int *xp,int *yp)
|
static void get_display_origin(int *xp,int *yp)
|
||||||
{
|
{
|
||||||
@ -872,6 +873,17 @@ static void get_display_origin(int *xp,int *yp)
|
|||||||
EnumDisplayMonitors(0,0,m_proc,(LPARAM)&st);
|
EnumDisplayMonitors(0,0,m_proc,(LPARAM)&st);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
#pragma message( "-display parameter only works if compiled with WINVER >= 0x0500")
|
||||||
|
|
||||||
|
static void get_display_origin(int *xp,int *yp)
|
||||||
|
{
|
||||||
|
if( fgDisplay.DisplayName )
|
||||||
|
{
|
||||||
|
fgWarning( "for working -display support FreeGLUT must be compiled with WINVER >= 0x0500");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user