From 33d4e09d60d11187ba13670f6f14a11a10be6405 Mon Sep 17 00:00:00 2001
From: Michael du Breuil <wicked.shell.scripts@gmail.com>
Date: Thu, 27 Sep 2018 19:09:58 -0700
Subject: [PATCH] Tools: Add lua source to waf

---
 Tools/ardupilotwaf/ardupilotwaf.py | 1 -
 Tools/ardupilotwaf/boards.py       | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 49c8e703cf..000e1efc75 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -76,7 +76,6 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
     'AP_Gripper',
     'AP_RTC',
     'AC_Sprayer',
-    'AP_Scripting',
 ]
 
 def get_legacy_defines(sketch_name):
diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 2a3d07ce7a..8706571ba5 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -94,8 +94,14 @@ class Board:
         if cfg.options.enable_scripting:
             env.DEFINES.update(
                 ENABLE_SCRIPTING = 1,
+                LUA_32BITS = 1,
                 )
 
+            env.AP_LIBRARIES += [
+                'AP_Scripting',
+                'AP_Scripting/lua/src',
+                ]
+
         if 'clang' in cfg.env.COMPILER_CC:
             env.CFLAGS += [
                 '-fcolor-diagnostics',
@@ -327,6 +333,9 @@ class chibios(Board):
 
         # make board name available for USB IDs
         env.CHIBIOS_BOARD_NAME = 'HAL_BOARD_NAME="%s"' % self.name
+        env.CFLAGS += [
+            '-Wno-cast-align',
+        ]
         env.CXXFLAGS += cfg.env.CPU_FLAGS + [
             '-Wlogical-op',
             '-Wframe-larger-than=1300',