Browse Source

Fixed SDL include path

QGC4.4
Lorenz Meier 13 years ago
parent
commit
b9b9fbc419
  1. 14
      qgroundcontrol.pri
  2. 4
      src/input/JoystickInput.h

14
qgroundcontrol.pri

@ -30,21 +30,21 @@ win32-msvc2008|win32-msvc2010 {
DEFINES += _TTY_NOWARN_ DEFINES += _TTY_NOWARN_
# MAC OS X # MAC OS X
macx|macx-g++42|macx-g++: { macx|macx-g++42|macx-g++|macx-llvm: {
CONFIG += x86_64 cocoa phonon CONFIG += x86_64 cocoa phonon
CONFIG -= x86 CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
INCLUDEPATH += -framework SDL INCLUDEPATH += $$BASEDIR/libs/lib/Frameworks/SDL.framework/Headers
LIBS += -framework IOKit \ LIBS += -framework IOKit \
-F$$BASEDIR/libs/lib/Frameworks \ -F$$BASEDIR/libs/lib/Frameworks \
-framework SDL \ -framework SDL \
-framework CoreFoundation \ -framework CoreFoundation \
-framework ApplicationServices \ -framework ApplicationServices \
-lm -lm
ICON = $$BASEDIR/files/images/icons/macx.icns ICON = $$BASEDIR/files/images/icons/macx.icns

4
src/input/JoystickInput.h

@ -36,7 +36,11 @@ This file is part of the PIXHAWK project
#include <QThread> #include <QThread>
#include <QList> #include <QList>
#include <qmutex.h> #include <qmutex.h>
#ifdef Q_OS_MAC
#include <SDL.h>
#else
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif
#include "UASInterface.h" #include "UASInterface.h"

Loading…
Cancel
Save