From a738f674cc739a20f571f2935fbe4a4a172fcab7 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 9 Jul 2015 22:22:28 +0200
Subject: [PATCH] Mavlink compilation failure

---
 radio/src/Makefile                | 1 +
 radio/src/gui/9X/menu_model.cpp   | 2 +-
 radio/src/gui/9X/view_mavlink.cpp | 2 +-
 radio/src/gui/9X/view_mavlink.h   | 2 +-
 radio/src/telemetry/mavlink.h     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 7de64a557..4d4952764 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1235,6 +1235,7 @@ endif
 
 ifeq ($(EXT), MAVLINK)
  CPPDEFS += -DMAVLINK
+ INCDIRS += thirdparty
  CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp serial.cpp
  EEPROM_VARIANT += ${MAVLINK_VARIANT}
 endif
diff --git a/radio/src/gui/9X/menu_model.cpp b/radio/src/gui/9X/menu_model.cpp
index 726ff4e20..23cdc2456 100755
--- a/radio/src/gui/9X/menu_model.cpp
+++ b/radio/src/gui/9X/menu_model.cpp
@@ -36,7 +36,7 @@
 #include "../../opentx.h"
 
 #if defined(MAVLINK)
-#include "view_mavlink.h"
+#include "gui/9X/view_mavlink.h"
 #endif
 
 // TODO elsewhere!
diff --git a/radio/src/gui/9X/view_mavlink.cpp b/radio/src/gui/9X/view_mavlink.cpp
index a5ece6f37..672e28081 100755
--- a/radio/src/gui/9X/view_mavlink.cpp
+++ b/radio/src/gui/9X/view_mavlink.cpp
@@ -41,7 +41,7 @@
  *	Contains the menu specific code for Mavlink support.
  */
 
-#include "view_mavlink.h"
+#include "gui/9X/view_mavlink.h"
 
 // Globals declaration
 
diff --git a/radio/src/gui/9X/view_mavlink.h b/radio/src/gui/9X/view_mavlink.h
index db12dde19..993bca2b3 100755
--- a/radio/src/gui/9X/view_mavlink.h
+++ b/radio/src/gui/9X/view_mavlink.h
@@ -45,7 +45,7 @@
 
 #include "opentx.h"
 #include "telemetry/mavlink.h"
-#include "gui/menus.h"
+#include "gui/9X/menus.h"
 #include "serial.h"
 
 #define APSIZE (BSS | DBLSIZE)
diff --git a/radio/src/telemetry/mavlink.h b/radio/src/telemetry/mavlink.h
index 1ba385bf1..9c76b54c6 100644
--- a/radio/src/telemetry/mavlink.h
+++ b/radio/src/telemetry/mavlink.h
@@ -62,7 +62,7 @@ extern void SERIAL_send_uart_bytes(const uint8_t * buf, uint16_t len);
 #define MAVLINK_END_UART_SEND(chan,len) SERIAL_end_uart_send()
 #define MAVLINK_SEND_UART_BYTES(chan,buf,len) SERIAL_send_uart_bytes(buf,len)
 
-#include "../GCS_MAVLink/include_v1.0/ardupilotmega/mavlink.h"
+#include "GCS_MAVLink/include_v1.0/ardupilotmega/mavlink.h"
 
 //#define MAVLINK_PARAMS
 //#define DUMP_RX_TX