From 0825a406c6b328f2f81ff63e653210b08bebcf5b Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 27 Sep 2010 22:55:01 +0000 Subject: [PATCH] add firmwares/[fixedwing|rotorcraft] to include dirs --- conf/autopilot/fixedwing.makefile | 4 +++- conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/autopilot/fixedwing.makefile b/conf/autopilot/fixedwing.makefile index 7e9603066e..240fdce423 100644 --- a/conf/autopilot/fixedwing.makefile +++ b/conf/autopilot/fixedwing.makefile @@ -13,7 +13,9 @@ SRC_FIXEDWING=. SRC_ARCH=$(SRC_FIXEDWING)/arch/$(ARCH) SRC_FIXEDWING_TEST=$(SRC_FIXEDWING)/ -FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH) +SRC_FIRMWARE=firmwares/fixedwing + +FIXEDWING_INC = -I$(SRC_FIRMWARE) -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH) diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile index 59c4b8a461..42ec0a2ee9 100644 --- a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile +++ b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile @@ -11,6 +11,8 @@ JSBSIM_LIB = $(JSBSIM_ROOT)/lib SRC_BOOZ=booz SRC_BOOZ_SIM = $(SRC_BOOZ)/arch/sim +SRC_FIRMWARE=firmwares/rotorcraft + SRC_BOARD=boards/$(BOARD) NPSDIR = $(SIMDIR)/nps @@ -24,7 +26,7 @@ sim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lmeschach -lpcre -lglibivy sim.CFLAGS += -I$(NPSDIR) -I/usr/local/include -I$(JSBSIM_INC) sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim -sim.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps +sim.CFLAGS += -I$(SRC_FIRMWARE) -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps sim.srcs = $(NPSDIR)/nps_main.c \ $(NPSDIR)/nps_fdm_jsbsim.c \