diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 10:40:00 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 10:40:00 +0200 |
| commit | 6aefe5fddfcba3f40406cd9cc85acf142421d53b (patch) | |
| tree | 4ed847f064a474942d45bea4f069406946119db3 /makefiles | |
| parent | d07631d0560dfb4e5e745fa81a0c2f160e9d5900 (diff) | |
| parent | b1de6c0eaf26b9bb05075ffa18e1eb32d3cae75b (diff) | |
| download | px4-firmware-6aefe5fddfcba3f40406cd9cc85acf142421d53b.tar.gz px4-firmware-6aefe5fddfcba3f40406cd9cc85acf142421d53b.tar.bz2 px4-firmware-6aefe5fddfcba3f40406cd9cc85acf142421d53b.zip | |
Merged export-build
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 27 | ||||
| -rw-r--r-- | makefiles/module.mk | 2 | ||||
| -rw-r--r-- | makefiles/setup.mk | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index e374c088b..32b26fcf1 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -10,6 +10,7 @@ ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common # # Board support modules # +MODULES += drivers/device MODULES += drivers/stm32 MODULES += drivers/stm32/adc MODULES += drivers/stm32/tone_alarm @@ -76,6 +77,32 @@ MODULES += modules/multirotor_pos_control MODULES += modules/sdlog # +# Libraries +# +MODULES += modules/systemlib +MODULES += modules/systemlib/mixer +MODULES += modules/mathlib +MODULES += modules/mathlib/CMSIS +MODULES += modules/controllib +MODULES += modules/uORB + +# +# Demo apps +# +#MODULES += examples/math_demo +# Tutorial code from +# https://pixhawk.ethz.ch/px4/dev/hello_sky +#MODULES += examples/px4_simple_app + +# Tutorial code from +# https://pixhawk.ethz.ch/px4/dev/daemon +#MODULES += examples/px4_daemon_app + +# Tutorial code from +# https://pixhawk.ethz.ch/px4/dev/debug_values +#MODULES += examples/px4_mavlink_debug + +# # Transitional support - add commands from the NuttX export archive. # # In general, these should move to modules over time. diff --git a/makefiles/module.mk b/makefiles/module.mk index 253b3cd52..86810627b 100644 --- a/makefiles/module.mk +++ b/makefiles/module.mk @@ -186,7 +186,7 @@ define SRC_SEARCH $(abspath $(firstword $(wildcard $(MODULE_SRC)/$1) MISSING_$1)) endef -ABS_SRCS := $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src))) +ABS_SRCS ?= $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src))) MISSING_SRCS := $(subst MISSING_,,$(filter MISSING_%,$(ABS_SRCS))) ifneq ($(MISSING_SRCS),) $(error $(MODULE_MK): missing in SRCS: $(MISSING_SRCS)) diff --git a/makefiles/setup.mk b/makefiles/setup.mk index b798f7cab..3c910bcfa 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -56,6 +56,7 @@ export ARCHIVE_DIR = $(abspath $(PX4_BASE)/Archives)/ # Default include paths # export INCLUDE_DIRS := $(PX4_MODULE_SRC) \ + $(PX4_MODULE_SRC)/modules/ \ $(PX4_INCLUDE_DIR) # Include from legacy app/library path |