fly/flightgear
1
0
Fork 0
Code Activity

Minor changes to several includes to allow out of source tree builds.

Browse source
This commit is contained in:
curt 2000-09-26 21:44:52 +00:00
parent 5052f93ad4
commit 4b6b2bc06d
15 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/UIUCModel/Makefile.am
View file

@ -47,4 +47,4 @@ libUIUCModel_a_SOURCES = \
uiuc_warnings_errors.cpp uiuc_warnings_errors.h \ uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
uiuc_wrapper.cpp uiuc_wrapper.h uiuc_wrapper.cpp uiuc_wrapper.h
INCLUDES += -I$(top_srcdir) INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

4
src/FDM/UIUCModel/uiuc_aerodeflections.h
View file

@ -2,8 +2,8 @@
#define _AERODEFLECTIONS_H_ #define _AERODEFLECTIONS_H_
#include "uiuc_aircraft.h" /* aileron, elevator, rudder */ #include "uiuc_aircraft.h" /* aileron, elevator, rudder */
#include "../LaRCsim/ls_cockpit.h" /* Long_control, Lat_control, Rudder_pedal */ #include <FDM/LaRCsim/ls_cockpit.h> /* Long_control, Lat_control, Rudder_pedal */
#include "../LaRCsim/ls_constants.h" /* RAD_TO_DEG, DEG_TO_RAD */ #include <FDM/LaRCsim/ls_constants.h> /* RAD_TO_DEG, DEG_TO_RAD */
void uiuc_aerodeflections( double dt ); void uiuc_aerodeflections( double dt );

8
src/FDM/UIUCModel/uiuc_betaprobe.h
View file

@ -1,11 +1,13 @@
#ifndef _BETAPROBE_H_ #ifndef _BETAPROBE_H_
#define _BETAPROBE_H_ #define _BETAPROBE_H_
#include "uiuc_aircraft.h"
#include "../FDM/LaRCsim/ls_constants.h"
#include "../FDM/LaRCsim/ls_generic.h"
#include <math.h> #include <math.h>
#include <FDM/LaRCsim/ls_constants.h>
#include <FDM/LaRCsim/ls_generic.h>
#include "uiuc_aircraft.h"
void uiuc_betaprobe(); void uiuc_betaprobe();
#endif // _BETAPROBE_H_ #endif // _BETAPROBE_H_

3
src/FDM/UIUCModel/uiuc_coef_drag.h
View file

@ -1,12 +1,13 @@
#ifndef _COEF_DRAG_H_ #ifndef _COEF_DRAG_H_
#define _COEF_DRAG_H_ #define _COEF_DRAG_H_
#include <FDM/LaRCsim/ls_generic.h>
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h"
void uiuc_coef_drag(); void uiuc_coef_drag();

3
src/FDM/UIUCModel/uiuc_coef_lift.h
View file

@ -1,12 +1,13 @@
#ifndef _COEF_LIFT_H_ #ifndef _COEF_LIFT_H_
#define _COEF_LIFT_H_ #define _COEF_LIFT_H_
#include <FDM/LaRCsim/ls_generic.h>
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h"
void uiuc_coef_lift(); void uiuc_coef_lift();

2
src/FDM/UIUCModel/uiuc_coef_pitch.h
View file

@ -6,7 +6,7 @@
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
void uiuc_coef_pitch(); void uiuc_coef_pitch();

2
src/FDM/UIUCModel/uiuc_coef_roll.h
View file

@ -6,7 +6,7 @@
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
void uiuc_coef_roll(); void uiuc_coef_roll();

2
src/FDM/UIUCModel/uiuc_coef_sideforce.h
View file

@ -6,7 +6,7 @@
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
void uiuc_coef_sideforce(); void uiuc_coef_sideforce();

2
src/FDM/UIUCModel/uiuc_coef_yaw.h
View file

@ -6,7 +6,7 @@
#include "uiuc_1Dinterpolation.h" #include "uiuc_1Dinterpolation.h"
#include "uiuc_2Dinterpolation.h" #include "uiuc_2Dinterpolation.h"
#include "uiuc_ice.h" #include "uiuc_ice.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
void uiuc_coef_yaw(); void uiuc_coef_yaw();

2
src/FDM/UIUCModel/uiuc_coefficients.h
View file

@ -9,7 +9,7 @@
#include "uiuc_coef_sideforce.h" #include "uiuc_coef_sideforce.h"
#include "uiuc_coef_roll.h" #include "uiuc_coef_roll.h"
#include "uiuc_coef_yaw.h" #include "uiuc_coef_yaw.h"
#include "../LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
void uiuc_coefficients(); void uiuc_coefficients();

2
src/FDM/UIUCModel/uiuc_convert.h
View file

@ -1,7 +1,7 @@
#ifndef _CONVERT_H_ #ifndef _CONVERT_H_
#define _CONVERT_H_ #define _CONVERT_H_
#include "../LaRCsim/ls_constants.h" /* uses RAD_TO_DEG, DEG_TO_RAD */ #include <FDM/LaRCsim/ls_constants.h> /* uses RAD_TO_DEG, DEG_TO_RAD */
double uiuc_convert( int conversionType ); double uiuc_convert( int conversionType );

4
src/FDM/UIUCModel/uiuc_engine.h
View file

@ -2,8 +2,8 @@
#define _ENGINE_H_ #define _ENGINE_H_
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
#include "../LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
#include "../LaRCsim/ls_cockpit.h" #include <FDM/LaRCsim/ls_cockpit.h>
void uiuc_engine(); void uiuc_engine();
#endif // _ENGINE_H_ #endif // _ENGINE_H_

6
src/FDM/UIUCModel/uiuc_menu.h
View file

@ -9,9 +9,9 @@
#include "uiuc_initializemaps.h" #include "uiuc_initializemaps.h"
#include "uiuc_1DdataFileReader.h" #include "uiuc_1DdataFileReader.h"
#include "uiuc_2DdataFileReader.h" #include "uiuc_2DdataFileReader.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
#include "../FDM/LaRCsim/ls_cockpit.h" /* Long_trim defined */ #include <FDM/LaRCsim/ls_cockpit.h> /* Long_trim defined */
#include "../FDM/LaRCsim/ls_constants.h" /* INVG defined */ #include <FDM/LaRCsim/ls_constants.h> /* INVG defined */
bool check_float(string &token); // To check whether the token is a float or not bool check_float(string &token); // To check whether the token is a float or not
void uiuc_menu (string aircraft); void uiuc_menu (string aircraft);

6
src/FDM/UIUCModel/uiuc_recorder.h
View file

@ -4,9 +4,9 @@
#include "uiuc_parsefile.h" #include "uiuc_parsefile.h"
#include "uiuc_aircraft.h" #include "uiuc_aircraft.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
#include "../FDM/LaRCsim/ls_cockpit.h" #include <FDM/LaRCsim/ls_cockpit.h>
#include "../FDM/LaRCsim/ls_constants.h" #include <FDM/LaRCsim/ls_constants.h>
extern double Simtime; extern double Simtime;

2
src/FDM/UIUCModel/uiuc_wrapper.cpp
View file

@ -71,7 +71,7 @@
#include "uiuc_recorder.h" #include "uiuc_recorder.h"
#include "uiuc_menu.h" #include "uiuc_menu.h"
#include "uiuc_betaprobe.h" #include "uiuc_betaprobe.h"
#include "../FDM/LaRCsim/ls_generic.h" #include <FDM/LaRCsim/ls_generic.h>
extern "C" void uiuc_init_aeromodel (); extern "C" void uiuc_init_aeromodel ();
extern "C" void uiuc_force_moment(double dt); extern "C" void uiuc_force_moment(double dt);