Boris Koenig:

[flightgear.git] / src / Main / fg_os.cxx

diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx
index 81ddf0b55b81ed62c317dac01f8ad23701c74656..fc404a00fabf5b755a1515132ba021009c12510e 100644 (file)
--- a/src/Main/fg_os.cxx
+++ b/src/Main/fg_os.cxx
@@ -1,5 +1,9 @@
 // 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
@@ -139,6 +143,11 @@ void fgOSMainLoop()
     glutMainLoop();
 }
 
+void fgOSExit(int code)
+{
+    exit(code);
+}
+
 static int CurrentCursor = MOUSE_CURSOR_POINTER;
 
 int fgGetMouseCursor()
@@ -177,7 +186,8 @@ void fgRequestRedraw()
     glutPostRedisplay();
 }
 
-void fgOSOpenWindow(int w, int h, int bpp, bool alpha, bool stencil)
+void fgOSOpenWindow(int w, int h, int bpp, bool alpha,
+                    bool stencil, bool fullscreen)
 {
     int mode = GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE;
     if(alpha) mode |= GLUT_ALPHA;