Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b9b9fbc4
Commit
b9b9fbc4
authored
Sep 19, 2012
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed SDL include path
parent
ab57e1ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
qgroundcontrol.pri
qgroundcontrol.pri
+7
-7
JoystickInput.h
src/input/JoystickInput.h
+4
-0
No files found.
qgroundcontrol.pri
View file @
b9b9fbc4
...
...
@@ -30,21 +30,21 @@ win32-msvc2008|win32-msvc2010 {
DEFINES += _TTY_NOWARN_
# MAC OS X
macx|macx-g++42|macx-g++: {
macx|macx-g++42|macx-g++
|macx-llvm
: {
CONFIG += x86_64 cocoa phonon
CONFIG -= x86
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 \
-framework SDL \
-framework CoreFoundation \
-framework ApplicationServices \
-lm
-framework SDL \
-framework CoreFoundation \
-framework ApplicationServices \
-lm
ICON = $$BASEDIR/files/images/icons/macx.icns
...
...
src/input/JoystickInput.h
View file @
b9b9fbc4
...
...
@@ -36,7 +36,11 @@ This file is part of the PIXHAWK project
#include <QThread>
#include <QList>
#include <qmutex.h>
#ifdef Q_OS_MAC
#include <SDL.h>
#else
#include <SDL/SDL.h>
#endif
#include "UASInterface.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment