From c7c05ebf10d2f708d2b495c5b06a9131a158ac6a Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 2 Mar 2015 17:00:55 +0100 Subject: [PATCH] [build] also fix nps build for crrcsim --- .../subsystems/fixedwing/fdm_crrcsim.makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile b/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile index 97c7509527..fdc75ecede 100644 --- a/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile +++ b/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile @@ -8,9 +8,6 @@ SRC_FIRMWARE=firmwares/fixedwing SRC_BOARD=boards/$(BOARD) -NPSDIR = $(SIMDIR)/nps - - nps.ARCHDIR = sim # include Makefile.nps instead of Makefile.sim @@ -23,9 +20,15 @@ nps.srcs += $(fbw_srcs) $(ap_srcs) nps.CFLAGS += -DSITL -DUSE_NPS nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags) nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy $(shell pcre-config --libs) -lgsl -lgslcblas -nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps +nps.CFLAGS += -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I$(PAPARAZZI_SRC)/sw/simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps nps.LDFLAGS += $(shell sdl-config --libs) +# +# add the simulator directory to the make searchpath +# +VPATH = $(PAPARAZZI_SRC)/sw/simulator + +NPSDIR = nps nps.srcs += $(NPSDIR)/nps_main.c \ $(NPSDIR)/nps_fdm_crrcsim.c \ $(NPSDIR)/nps_random.c \