Skip to content

Q
qgroundcontrol
Commit 83ec7cd3 authored by pixhawk's avatar pixhawk
Browse files
Options

Fixed compilation under MacOS, windows check next step

parent 44987026
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
qgroundcontrol.pri
View file @ 83ec7cd3
...@@ -69,6 +69,7 @@ macx { ...@@ -69,6 +69,7 @@ macx {
-framework SDL \ -framework SDL \
-framework CoreFoundation \ -framework CoreFoundation \
-framework ApplicationServices \ -framework ApplicationServices \
-framework GLUT \
-lm -lm
ICON = $$BASEDIR/images/icons/macx.icns ICON = $$BASEDIR/images/icons/macx.icns
...@@ -114,7 +115,8 @@ linux-g++ { ...@@ -114,7 +115,8 @@ linux-g++ {
-lflite_cmulex \ -lflite_cmulex \
-lflite \ -lflite \
-lSDL \ -lSDL \
-lSDLmain -lSDLmain \
-lglut
} }
......
qgroundcontrol.pro
View file @ 83ec7cd3
...@@ -44,7 +44,6 @@ INCLUDEPATH += . \ ...@@ -44,7 +44,6 @@ INCLUDEPATH += . \
lib/QMapControl \ lib/QMapControl \
$$BASEDIR/../mavlink/contrib/slugs/include \ $$BASEDIR/../mavlink/contrib/slugs/include \
$$BASEDIR/../mavlink/include $$BASEDIR/../mavlink/include
LIBS += -lglut
# ../mavlink/include \ # ../mavlink/include \
# MAVLink/include \ # MAVLink/include \
......
src/ui/map3D/QMap3DWidget.cc
View file @ 83ec7cd3
...@@ -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" #include "QMap3DWidget.h"
#if (defined __APPLE__) & (defined __MACH__)
#include <GLUT/glut.h>
#else
#include <GL/glut.h> #include <GL/glut.h>
#endif
#include <QCheckBox> #include <QCheckBox>
#include <sys/time.h> #include <sys/time.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment