dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into fixedwing_l1

This commit is contained in:
Lorenz Meier 2013-09-07 12:24:40 +02:00
parent fb9e98fb59 b599a32c16
commit b6dd579e0e
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/mathlib/math/filter/module.mk
View File

@ -41,4 +41,3 @@ SRCS = LowPassFilter2p.cpp
# current makefile name, since app.mk needs it. # current makefile name, since app.mk needs it.
# #
APP_MAKEFILE := $(lastword $(MAKEFILE_LIST)) APP_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-include $(TOPDIR)/.config

1
src/lib/mathlib/module.mk
View File

@ -49,7 +49,6 @@ SRCS = math/test/test.cpp \
# current makefile name, since app.mk needs it. # current makefile name, since app.mk needs it.
# #
APP_MAKEFILE := $(lastword $(MAKEFILE_LIST)) APP_MAKEFILE := $(lastword $(MAKEFILE_LIST))
-include $(TOPDIR)/.config
ifeq ($(CONFIG_ARCH_CORTEXM4)$(CONFIG_ARCH_FPU),yy) ifeq ($(CONFIG_ARCH_CORTEXM4)$(CONFIG_ARCH_FPU),yy)
INCLUDE_DIRS += math/arm INCLUDE_DIRS += math/arm