fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 07:51:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1

Browse Source
This commit is contained in:
Lorenz Meier
2013-09-08 00:50:37 +02:00
parent fb9e98fb59 751c026469
commit 14828cfda5
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/mathlib/math/filter/module.mk
-1
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
src/lib/mathlib/module.mk
-1
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