From e7036cd3a8c583d1f927eba598c4250fc1c2c2b8 Mon Sep 17 00:00:00 2001
From: Matthias Krebs <makrebs@student.ethz.ch>
Date: Sun, 18 Nov 2012 15:39:00 +0100
Subject: [PATCH] 3DMouse Implementation for Windows completed (tested on win8
 (and ubuntu 12.04))

---
 qgroundcontrol.pro  | 4 ++--
 src/ui/MainWindow.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 54d414fb8..1c8c52864 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -625,7 +625,7 @@ win32-msvc2008|win32-msvc2010|linux {
         -llibxbee
 }
 
-#win32-msvc2008|win32-msvc2010 {
+win32-msvc2008|win32-msvc2010 {
     message("Including support for 3DxWare for Windows system.")
     SOURCES  += libs/thirdParty/3DMouse/win/MouseParameters.cpp \
                 libs/thirdParty/3DMouse/win/Mouse3DInput.cpp \
@@ -636,4 +636,4 @@ win32-msvc2008|win32-msvc2010|linux {
                 src/input/Mouse6dofInput.h
     INCLUDEPATH += libs/thirdParty/3DMouse/win
     DEFINES += MOUSE_ENABLED_WIN
-#}
+}
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 002f32029..b9727a59a 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -54,7 +54,9 @@ This file is part of the QGROUNDCONTROL project
 #include "HUD.h"
 #include "JoystickWidget.h"
 #include "input/JoystickInput.h"
+#ifdef MOUSE_ENABLED_WIN
 #include "input/Mouse6dofInput.h"
+#endif // MOUSE_ENABLED_WIN
 #include "DebugConsole.h"
 #include "ParameterInterface.h"
 #include "XMLCommProtocolWidget.h"
-- 
2.22.0