fgpanel: fix compile for OSX

diff --git a/utils/fgpanel/FGGLApplication.cxx b/utils/fgpanel/FGGLApplication.cxx
index 54550ad4bc722f1a4286c0c08dbab085afe102b3..b0f58d250b2d426255c26aa28e15a1c8d251981a 100644 (file)
--- a/utils/fgpanel/FGGLApplication.cxx
+++ b/utils/fgpanel/FGGLApplication.cxx
@@ -21,12 +21,19 @@
 #endif
 
 #include "FGGLApplication.hxx"
+#include <simgear/compiler.h>
+
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
-#define snprintf sprintf_s\r
+#define snprintf sprintf_s
 #endif
+#if defined (SG_MAC)
+#include <OpenGL/gl.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/gl.h>
 #include <GL/glut.h>
+#endif
 
 #include <iostream>
 #include <exception>

diff --git a/utils/fgpanel/FGPNGTextureLoader.cxx b/utils/fgpanel/FGPNGTextureLoader.cxx
index 1d18e4190041290a93063b3ac7e27811dbf899d6..a8a8baef4e8c98e72a0fd0acecd2d3b74cdd75e4 100644 (file)
--- a/utils/fgpanel/FGPNGTextureLoader.cxx
+++ b/utils/fgpanel/FGPNGTextureLoader.cxx
@@ -22,7 +22,11 @@
 #endif
 #include "FGPNGTextureLoader.hxx"
 
-#include <GL/glu.h>
+#if defined (SG_MAC)
+#include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
+#endif
 #include <png.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/utils/fgpanel/FGPanelApplication.cxx b/utils/fgpanel/FGPanelApplication.cxx
index a57b8f6a3879009bb9d732cdf8fc9de5e9ab8eb6..0477be7e210e8093f2f432e58428970f163551e2 100644 (file)
--- a/utils/fgpanel/FGPanelApplication.cxx
+++ b/utils/fgpanel/FGPanelApplication.cxx
@@ -26,8 +26,13 @@
 
 #include "FGGLApplication.hxx"
 #include "FGPanelApplication.hxx"
+#if defined (SG_MAC)
+#include <OpenGL/gl.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/gl.h>
 #include <GL/glut.h>
+#endif
 
 #include <simgear/math/SGMisc.hxx>
 #include <simgear/misc/sg_path.hxx>

diff --git a/utils/fgpanel/FGRGBTextureLoader.cxx b/utils/fgpanel/FGRGBTextureLoader.cxx
index e9ef556abbbcfa062e405f7dfd706353b63dd587..e5dbe6e0338326c3652a6f267e7b676c37e48a97 100644 (file)
--- a/utils/fgpanel/FGRGBTextureLoader.cxx
+++ b/utils/fgpanel/FGRGBTextureLoader.cxx
@@ -26,8 +26,13 @@
 #endif
 
 #include "FGRGBTextureLoader.hxx"
+#if defined (SG_MAC)
+#include <OpenGL/gl.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/gl.h>
-#include <GL/glu.h>
+#include <GL/glut.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/utils/fgpanel/FGTextureLoaderInterface.hxx b/utils/fgpanel/FGTextureLoaderInterface.hxx
index 58c15b853e109ee6e2b8ea3f8693d5901b13676c..09009309cd88c4b0fe85fa8934cfa6b6c60771a1 100644 (file)
--- a/utils/fgpanel/FGTextureLoaderInterface.hxx
+++ b/utils/fgpanel/FGTextureLoaderInterface.hxx
@@ -17,8 +17,12 @@
 //
 #ifndef __FGTEXTURELOADERINTERFACE_HXX
 #define __FGTEXTURELOADERINTERFACE_HXX
-
+#include <simgear/compiler.h>
+#if defined (SG_MAC)
+#include <OpenGL/gl.h>
+#else
 #include <GL/gl.h>
+#endif
 #include <string>
 class FGTextureLoaderInterface {
 public:

diff --git a/utils/fgpanel/panel.cxx b/utils/fgpanel/panel.cxx
index ff8cdc6347958f5fff150cddc3d75f011fe3e811..70c40876b5f38475827f6fb86bc6cc8e13ea9d1e 100644 (file)
--- a/utils/fgpanel/panel.cxx
+++ b/utils/fgpanel/panel.cxx
@@ -31,7 +31,11 @@
 
 #include <simgear/compiler.h>
 
+#if defined (SG_MAC)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 
 #include <plib/fnt.h>