More fixes to the ATCDCL & ATC compilation
Rename ATC/atis.[ch]xx to ATC/atis_mgr.[ch]xx, to avoid confusingly having 2 atis.cxx and 2 atis.hxx in the source tree. Also fix a copy and paste error in src/ATCDCL/CMakeLists.txt.
This commit is contained in:
parent
9aa53cb6ab
commit
07d430c129
6 changed files with 5 additions and 5 deletions
|
@ -1,7 +1,7 @@
|
|||
include(FlightGearComponent)
|
||||
|
||||
set(SOURCES
|
||||
atis.cxx
|
||||
atis_mgr.cxx
|
||||
trafficcontrol.cxx
|
||||
)
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
noinst_LIBRARIES = libATC.a
|
||||
|
||||
libATC_a_SOURCES = \
|
||||
atis.cxx atis.hxx \
|
||||
atis_mgr.cxx atis_mgr.hxx \
|
||||
trafficcontrol.cxx trafficcontrol.hxx
|
||||
|
||||
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include <iostream>
|
||||
|
||||
#include <simgear/math/SGMath.hxx>
|
||||
#include "atis.hxx"
|
||||
#include "atis_mgr.hxx"
|
||||
|
||||
FGAtisManager::FGAtisManager() {
|
||||
|
|
@ -11,4 +11,4 @@ set(SOURCES
|
|||
ATCProjection.cxx
|
||||
)
|
||||
|
||||
flightgear_component(ATC "${SOURCES}")
|
||||
flightgear_component(ATCDCL "${SOURCES}")
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
#include <ATCDCL/ATCmgr.hxx>
|
||||
#include <ATCDCL/commlist.hxx>
|
||||
#include <ATC/atis.hxx>
|
||||
#include <ATC/atis_mgr.hxx>
|
||||
|
||||
#include <Autopilot/route_mgr.hxx>
|
||||
#include <Autopilot/autopilotgroup.hxx>
|
||||
|
|
Loading…
Add table
Reference in a new issue