From 83ec7cd3edac683d0468f3f39662bba6f208c17b Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@student.ethz.ch>
Date: Wed, 29 Sep 2010 06:57:01 +0200
Subject: [PATCH] Fixed compilation under MacOS, windows check next step

---
 qgroundcontrol.pri           | 4 +++-
 qgroundcontrol.pro           | 1 -
 src/ui/map3D/QMap3DWidget.cc | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index f9bffca..89f9c62 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -69,6 +69,7 @@ macx {
         -framework SDL \
         -framework CoreFoundation \
         -framework ApplicationServices \
+        -framework GLUT \
         -lm
     
     ICON = $$BASEDIR/images/icons/macx.icns
@@ -114,7 +115,8 @@ linux-g++ {
         -lflite_cmulex \
         -lflite \
         -lSDL \
-        -lSDLmain
+        -lSDLmain \
+        -lglut
 }
 
 
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 7e140e4..1c3a729 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -44,7 +44,6 @@ INCLUDEPATH += . \
     lib/QMapControl \
     $$BASEDIR/../mavlink/contrib/slugs/include \
     $$BASEDIR/../mavlink/include
-LIBS += -lglut
 
 # ../mavlink/include \
 # MAVLink/include \
diff --git a/src/ui/map3D/QMap3DWidget.cc b/src/ui/map3D/QMap3DWidget.cc
index 70626f1..a8a3b88 100644
--- a/src/ui/map3D/QMap3DWidget.cc
+++ b/src/ui/map3D/QMap3DWidget.cc
@@ -31,7 +31,11 @@ This file is part of the QGROUNDCONTROL project
 
 #include "QMap3DWidget.h"
 
+#if (defined __APPLE__) & (defined __MACH__)
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include <QCheckBox>
 #include <sys/time.h>