From 4a5dce9f48b8359d3a6ae56cafca70bfb00795d3 Mon Sep 17 00:00:00 2001 From: Anders Gidenstam Date: Wed, 5 Mar 2014 22:28:53 +0100 Subject: [PATCH] Added support for shared JSBSim engine and system configurations in fgdata. Adds $FG_ROOT/Aircraft/Generic/JSBSim/{Engines,Systems} to the JSBSim engines and system search paths. Internally JSBSim already searches $aircraft_dir/Engines and $aircraft_dir/Systems. A file in $aircraft_dir/{Engines,Systems} have higher priority than one in the shared directories. --- src/FDM/JSBSim/JSBSim.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx index 45b4b9e84..03bc13dbe 100644 --- a/src/FDM/JSBSim/JSBSim.cxx +++ b/src/FDM/JSBSim/JSBSim.cxx @@ -215,11 +215,11 @@ FGJSBsim::FGJSBsim( double dt ) SGPath aircraft_path( fgGetString("/sim/aircraft-dir") ); - SGPath engine_path( fgGetString("/sim/aircraft-dir") ); - engine_path.append( "Engine" ); + SGPath engine_path( fgGetString("/sim/fg-root") ); + engine_path.append( "Aircraft/Generic/JSBSim/Engines" ); - SGPath systems_path( fgGetString("/sim/aircraft-dir") ); - systems_path.append( "Systems" ); + SGPath systems_path( fgGetString("/sim/fg-root") ); + systems_path.append( "Aircraft/Generic/JSBSim/Systems" ); // deprecate sim-time-sec for simulation/sim-time-sec // remove alias with increased configuration file version number (2.1 or later) -- 2.39.5