Migrate FlightGear code to use "#include SG_GL*" defined in

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

diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx
index e7a86d81ff30797570098a80a0663595ee06c920..067503834d100399a3e8db295ef8ae6faccfd013 100644 (file)
--- a/src/Main/fg_os.cxx
+++ b/src/Main/fg_os.cxx
@@ -1,12 +1,16 @@
-// 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"
@@ -139,6 +143,11 @@ void fgOSMainLoop()
     glutMainLoop();
 }
 
+void fgOSExit(int code)
+{
+    exit(code);
+}
+
 static int CurrentCursor = MOUSE_CURSOR_POINTER;
 
 int fgGetMouseCursor()