Skip to content

Q
qgroundcontrol
Commit e7036cd3 authored by Matthias Krebs's avatar Matthias Krebs
Browse files
Options

3DMouse Implementation for Windows completed (tested on win8 (and ubuntu 12.04))

parent fde7770a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
qgroundcontrol.pro
View file @ e7036cd3
...@@ -625,7 +625,7 @@ win32-msvc2008|win32-msvc2010|linux { ...@@ -625,7 +625,7 @@ win32-msvc2008|win32-msvc2010|linux {
-llibxbee -llibxbee
} }
#win32-msvc2008|win32-msvc2010 { win32-msvc2008|win32-msvc2010 {
message("Including support for 3DxWare for Windows system.") message("Including support for 3DxWare for Windows system.")
SOURCES += libs/thirdParty/3DMouse/win/MouseParameters.cpp \ SOURCES += libs/thirdParty/3DMouse/win/MouseParameters.cpp \
libs/thirdParty/3DMouse/win/Mouse3DInput.cpp \ libs/thirdParty/3DMouse/win/Mouse3DInput.cpp \
...@@ -636,4 +636,4 @@ win32-msvc2008|win32-msvc2010|linux { ...@@ -636,4 +636,4 @@ win32-msvc2008|win32-msvc2010|linux {
src/input/Mouse6dofInput.h src/input/Mouse6dofInput.h
INCLUDEPATH += libs/thirdParty/3DMouse/win INCLUDEPATH += libs/thirdParty/3DMouse/win
DEFINES += MOUSE_ENABLED_WIN DEFINES += MOUSE_ENABLED_WIN
#} }
src/ui/MainWindow.h
View file @ e7036cd3
...@@ -54,7 +54,9 @@ This file is part of the QGROUNDCONTROL project ...@@ -54,7 +54,9 @@ This file is part of the QGROUNDCONTROL project
#include "HUD.h" #include "HUD.h"
#include "JoystickWidget.h" #include "JoystickWidget.h"
#include "input/JoystickInput.h" #include "input/JoystickInput.h"
#ifdef MOUSE_ENABLED_WIN
#include "input/Mouse6dofInput.h" #include "input/Mouse6dofInput.h"
#endif // MOUSE_ENABLED_WIN
#include "DebugConsole.h" #include "DebugConsole.h"
#include "ParameterInterface.h" #include "ParameterInterface.h"
#include "XMLCommProtocolWidget.h" #include "XMLCommProtocolWidget.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