fly/flightgear
1
0
Fork 0
Code Activity

Fix LaRCsim build errors

Browse source 
The previous commit (88c2b7a83) used '#if ENABLE_UIUC_MODEL' instead of
'#ifdef ENABLE_UIUC_MODEL' in a few places, causing a build error.
This commit is contained in:
Florent Rougon 2020-09-30 16:45:11 +02:00
parent 88c2b7a833
commit 8985626ad5
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/FDM/LaRCsim/LaRCsim.cxx
View file

@ -36,7 +36,7 @@
#include <FDM/flight.hxx>
#include <Main/fg_props.hxx>
#include <Model/acmodel.hxx>
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
# include <FDM/UIUCModel/uiuc_aircraft.h>
#endif
@ -319,7 +319,7 @@ void FGLaRCsim::update( double dt ) {
fgSetDouble("/engines/engine/running", 1);
// if flying uiuc, set some properties and over-ride some previous ones
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
if ( !strcmp(aero->getStringValue(), "uiuc")) {
// surface positions and other general properties
@ -760,7 +760,7 @@ bool FGLaRCsim::copy_from_LaRCsim() {
_set_Climb_Rate( -1 * V_down );
// cout << "climb rate = " << -V_down * 60 << endl;
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
if ( !strcmp(aero->getStringValue(), "uiuc") ) {
if (pilot_elev_no) {
globals->get_controls()->set_elevator(Long_control);

2
src/FDM/LaRCsim/ls_model.c
View file

@ -204,7 +204,7 @@ void ls_model( SCALAR dt, int Initialize ) {
basic_gear( dt, Initialize );
break;
case UIUC:
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
inertias( dt, Initialize );
subsystems( dt, Initialize );
// During initialization period, re-initialize velocities

4
src/FDM/LaRCsim/ls_step.c
View file

@ -313,7 +313,7 @@ Initial Flight Gear revision.
extern Model current_model; /* defined in ls_model.c */
extern SCALAR Simtime; /* defined in ls_main.c */
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
# include "FDM/UIUCModel/uiuc_wrapper.h"
void uiuc_init_vars() {
@ -367,7 +367,7 @@ void ls_step( SCALAR dt, int Initialize ) {
/* Initialize quaternions and transformation matrix from Euler angles */
// Initialize UIUC aircraft model
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
if (current_model == UIUC) {
uiuc_init_2_wrapper();
}

2
src/FDM/LaRCsim/uiuc_aero.c
View file

@ -53,7 +53,7 @@
--------------------------------------------------------------------------*/
#if ENABLE_UIUC_MODEL
#ifdef ENABLE_UIUC_MODEL
#include <math.h>
#include "ls_types.h"