From 8d67103214afbeaac4ca6e89b105bf6e55fad5d8 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <torsten@mustang.home.t3r.de>
Date: Sat, 4 Jun 2011 21:27:04 +0200
Subject: [PATCH] fgpanel: fix compile for OSX

---
 utils/fgpanel/FGGLApplication.cxx          | 9 ++++++++-
 utils/fgpanel/FGPNGTextureLoader.cxx       | 6 +++++-
 utils/fgpanel/FGPanelApplication.cxx       | 5 +++++
 utils/fgpanel/FGRGBTextureLoader.cxx       | 7 ++++++-
 utils/fgpanel/FGTextureLoaderInterface.hxx | 6 +++++-
 utils/fgpanel/panel.cxx                    | 4 ++++
 6 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/utils/fgpanel/FGGLApplication.cxx b/utils/fgpanel/FGGLApplication.cxx
index 54550ad4b..b0f58d250 100644
--- 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
+#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 1d18e4190..a8a8baef4 100644
--- 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 a57b8f6a3..0477be7e2 100644
--- 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 e9ef556ab..e5dbe6e03 100644
--- 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 58c15b853..09009309c 100644
--- 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 ff8cdc634..70c40876b 100644
--- 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>