Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 21:07:40 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

use package for sitl_jsbsim

Browse Source
This commit is contained in:
Felix Ruess
2010-10-11 16:46:03 +00:00
parent 9c19772207
commit d116aa9b91
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/jsbsim.xml
-3
View File
@@ -206,9 +206,6 @@ sim.srcs += nav_line.c nav_survey_rectangle.c
#### Config for SITL simulation with JSBSim #### Config for SITL simulation with JSBSim
include $(PAPARAZZI_SRC)/conf/autopilot/sitl_jsbsim.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl_jsbsim.makefile
jsbsim.CFLAGS += -I/home/cocoleon/usr/include/JSBSim
jsbsim.LDFLAGS += -L/home/cocoleon/usr/lib/
jsbsim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN jsbsim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
jsbsim.srcs += nav_line.c nav_survey_rectangle.c jsbsim.srcs += nav_line.c nav_survey_rectangle.c
jsbsim.srcs += $(SIMDIR)/sim_ac_fw.c jsbsim.srcs += $(SIMDIR)/sim_ac_fw.c
conf/autopilot/sitl_jsbsim.makefile
+21 -1
View File
@@ -1,8 +1,28 @@
ifndef JSBSIM_INC
JSBSIM_ROOT = /opt/jsbsim
JSBSIM_INC = $(JSBSIM_ROOT)/include/JSBSim
JSBSIM_LIB = $(JSBSIM_ROOT)/lib
endif
jsbsim.ARCHDIR = $(ARCH) jsbsim.ARCHDIR = $(ARCH)
# external libraries # external libraries
jsbsim.CFLAGS = -I$(SIMDIR) -I/usr/include `pkg-config glib-2.0 --cflags` jsbsim.CFLAGS = -I$(SIMDIR) -I/usr/include `pkg-config glib-2.0 --cflags`
jsbsim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/usr/lib -lJSBSim jsbsim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/usr/lib
# use the paparazzi-jsbsim package if it is installed, otherwise look for JSBsim under /opt/jsbsim
ifndef JSBSIM_PKG
JSBSIM_PKG = $(shell pkg-config JSBSim --exists && echo 'yes')
endif
ifeq ($(JSBSIM_PKG), yes)
jsbsim.CFLAGS += `pkg-config JSBSim --cflags`
jsbsim.LDFLAGS += `pkg-config JSBSim --libs`
else
JSBSIM_PKG = no
jsbsim.CFLAGS += -I$(JSBSIM_INC)
jsbsim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim
endif
jsbsim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO jsbsim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
jsbsim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_transport.c $(SRC_ARCH)/ivy_transport.c jsbsim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_transport.c $(SRC_ARCH)/ivy_transport.c
conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
+3 -1
View File
@@ -26,13 +26,15 @@ sim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lmeschach -lpcre -lglibivy
sim.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps sim.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOOZ) -I$(SRC_BOOZ_SIM) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps
# use the paparazzi-jsbsim package if it is installed, otherwise look for JSBsim under /opt/jsbsim # use the paparazzi-jsbsim package if it is installed, otherwise look for JSBsim under /opt/jsbsim
ifndef JSBSIM_PKG
JSBSIM_PKG = $(shell pkg-config JSBSim --exists && echo 'yes') JSBSIM_PKG = $(shell pkg-config JSBSim --exists && echo 'yes')
endif
ifeq ($(JSBSIM_PKG), yes) ifeq ($(JSBSIM_PKG), yes)
sim.CFLAGS += `pkg-config JSBSim --cflags` sim.CFLAGS += `pkg-config JSBSim --cflags`
sim.LDFLAGS += `pkg-config JSBSim --libs` sim.LDFLAGS += `pkg-config JSBSim --libs`
else else
JSBSIM_PKG = no JSBSIM_PKG = no
sim.CFLAGS += -I/usr/local/include -I$(JSBSIM_INC) sim.CFLAGS += -I$(JSBSIM_INC)
sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim sim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim
endif endif