From: Dave Luff <daveluff@ntlworld.com>
Date: Sun, 26 Dec 2010 23:19:57 +0000 (+0000)
Subject: Fix up some include paths in main.cxx
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=86505fd8bc6805052b910017f6ec49227effa8c5;p=flightgear.git

Fix up some include paths in main.cxx

Don't include legacy ATCmgr.hxx when it is not compiled (default).
Do include 3 paths that are necessary for main, but were only picked
up indirectly through the legacy ATC code.
---

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 5fec795ef..74e0ee9da 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -46,7 +46,8 @@
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/props/AtomicChangeListener.hxx>
 #include <simgear/props/props.hxx>
-//#include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/magvar/magvar.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/io/raw_socket.hxx>
 #include <simgear/misc/sg_sleep.hxx>
@@ -62,10 +63,13 @@
 #include <Sound/beacon.hxx>
 #include <Sound/morse.hxx>
 #include <Sound/fg_fx.hxx>
+#if ENABLE_ATCDCL
 #include <ATCDCL/ATCmgr.hxx>
+#endif
 #include <Time/TimeManager.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <Environment/ephemeris.hxx>
+#include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>