From 7c579c4814489ba310b834b34f437234a2c17980 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 31 Aug 2020 07:45:21 +1000 Subject: [PATCH] waf: added --osd configure option to allow boards with no builtin OSD to use MSP OSD --- Tools/ardupilotwaf/boards.py | 8 +++++++- wscript | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py index 069a474e97..4a3ce94449 100644 --- a/Tools/ardupilotwaf/boards.py +++ b/Tools/ardupilotwaf/boards.py @@ -3,6 +3,7 @@ from collections import OrderedDict import sys, os +import fnmatch import waflib from waflib import Utils @@ -310,6 +311,12 @@ class Board: if cfg.options.disable_ekf3: env.CXXFLAGS += ['-DHAL_NAVEKF3_AVAILABLE=0'] + if cfg.options.osd: + env.CXXFLAGS += ['-DOSD_ENABLED=1'] + for f in os.listdir('libraries/AP_OSD/fonts'): + if fnmatch.fnmatch(f, "font*bin"): + env.ROMFS_FILES += [(f,'libraries/AP_OSD/fonts/'+f)] + def pre_build(self, bld): '''pre-build hook that gets called before dynamic sources''' if bld.env.ROMFS_FILES: @@ -437,7 +444,6 @@ class sitl(Board): if not cfg.check_SFML(env): cfg.fatal("Failed to find SFML libraries") - import fnmatch if cfg.options.sitl_osd: env.CXXFLAGS += ['-DWITH_SITL_OSD','-DOSD_ENABLED=1'] for f in os.listdir('libraries/AP_OSD/fonts'): diff --git a/wscript b/wscript index 9c653a445f..837f6b69c4 100644 --- a/wscript +++ b/wscript @@ -188,6 +188,10 @@ configuration in order to save typing. default=False, help="Enable SFML audio library") + g.add_option('--osd', action='store_true', + default=False, + help="Enable OSD support") + g.add_option('--sitl-osd', action='store_true', default=False, help="Enable SITL OSD")