Fixed compilation under MacOS, windows check next step

15 years ago · 83ec7cd3ed
3 changed files with 7 additions and 2 deletions
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@ -69,6 +69,7 @@ macx {
				@@ -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++ {
				@@ -114,7 +115,8 @@ linux-g++ {
        -lflite_cmulex \
        -lflite \
        -lSDL \
-        -lSDLmain
+        -lSDLmain \
+        -lglut
 }


--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -44,7 +44,6 @@ INCLUDEPATH += . \
				@@ -44,7 +44,6 @@ INCLUDEPATH += . \
    lib/QMapControl \
    $$BASEDIR/../mavlink/contrib/slugs/include \
    $$BASEDIR/../mavlink/include
-LIBS += -lglut

 # ../mavlink/include \
 # MAVLink/include \
--- a/src/ui/map3D/QMap3DWidget.cc
+++ b/src/ui/map3D/QMap3DWidget.cc
@ -31,7 +31,11 @@ This file is part of the QGROUNDCONTROL project
				@@ -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>