-// The mac puts this in a weird location (GLUT/glut.h), so the
-// configure script detects the location and defines it as a macro.
+#ifndef _MSC_VER // MSVC really needs a definition for wchar_t
+#define _WCHAR_T_DEFINED 1 // Glut needs this, or else it tries to
+ // redefine it
+#endif
+
#ifdef HAVE_CONFIG_H
# include <config.h>
-# include FG_GLUT_H
-#else
-# include <GL/glut.h>
#endif
+#include <simgear/compiler.h>
+
+#include SG_GLUT_H
+
#include <plib/pu.h>
#include "fg_props.hxx"
glutMainLoop();
}
+void fgOSExit(int code)
+{
+ exit(code);
+}
+
static int CurrentCursor = MOUSE_CURSOR_POINTER;
int fgGetMouseCursor()
{
int mode = GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE;
if(alpha) mode |= GLUT_ALPHA;
- if(stencil) mode |= GLUT_STENCIL;
+ if(stencil && bpp > 16) mode |= GLUT_STENCIL;
glutInitDisplayMode(mode);
glutInitWindowSize(w, h);
if(!fgGetBool("/sim/startup/game-mode")) {
glutCreateWindow("FlightGear");
} else {
- char game_mode_str[256];
- sprintf(game_mode_str, "width=%d height=%d bpp=%d", w, h, bpp);
+ char game_mode_str[20];
+ SGPropertyNode *p = fgGetNode("/sim/frame-rate-throttle-hz", false);
+ if (p) {
+ int hz = p->getIntValue();
+ snprintf(game_mode_str, 20, "%dx%d:%d@%d", w, h, bpp, hz);
+ } else {
+ snprintf(game_mode_str, 20, "%dx%d:%d", w, h, bpp);
+ }
glutGameModeString( game_mode_str );
glutEnterGameMode();
}
glutIdleFunc(GLUTidle);
glutDisplayFunc(GLUTdraw);
glutReshapeFunc(GLUTreshape);
-
}
+