From 89b41395d861a49ad543af166c0bd41c14dd0d2b Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Wed, 25 Apr 2012 23:28:00 +0200
Subject: [PATCH] Move viewer-related sources to separate folder. Simple source
 directory clean-up, so "Main" folder contains fewer stuff and the list of
 files in the editors a lot shorter.

---
 src/AIModel/AIAircraft.cxx                   |  2 +-
 src/AIModel/AICarrier.cxx                    |  2 +-
 src/AIModel/AIEscort.cxx                     |  2 +-
 src/AIModel/AIGroundVehicle.cxx              |  2 +-
 src/CMakeLists.txt                           |  6 +++--
 src/Cockpit/panel.cxx                        |  4 +--
 src/Environment/environment_mgr.cxx          |  2 +-
 src/Environment/fgclouds.cxx                 |  4 +--
 src/Environment/precipitation_mgr.cxx        |  2 +-
 src/GUI/gui.cxx                              |  2 +-
 src/GUI/gui_funcs.cxx                        |  8 +++---
 src/Input/FGMouseInput.hxx                   |  3 ++-
 src/Instrumentation/HUD/HUD.cxx              |  4 +--
 src/Instrumentation/HUD/HUD_ladder.cxx       |  2 +-
 src/Instrumentation/HUD/HUD_runway.cxx       |  4 +--
 src/Instrumentation/groundradar.cxx          |  2 +-
 src/Instrumentation/od_gauge.cxx             |  2 +-
 src/Main/CMakeLists.txt                      | 19 -------------
 src/Main/bootstrap.cxx                       |  2 +-
 src/Main/fg_commands.cxx                     |  6 ++---
 src/Main/fg_init.cxx                         |  4 +--
 src/Main/fg_os_common.cxx                    |  4 +--
 src/Main/globals.cxx                         |  4 +--
 src/Main/main.cxx                            | 12 ++++-----
 src/Main/options.cxx                         |  6 ++---
 src/Model/acmodel.cxx                        |  6 ++---
 src/Network/jpg-httpd.cxx                    |  2 +-
 src/Network/props.cxx                        |  2 +-
 src/Scenery/scenery.cxx                      |  2 +-
 src/Scenery/tilemgr.cxx                      |  4 +--
 src/Time/light.cxx                           |  4 +--
 src/Viewer/CMakeLists.txt                    | 28 ++++++++++++++++++++
 src/{Main => Viewer}/CameraGroup.cxx         |  4 +--
 src/{Main => Viewer}/CameraGroup.hxx         |  0
 src/{Main => Viewer}/FGEventHandler.cxx      |  0
 src/{Main => Viewer}/FGEventHandler.hxx      |  2 +-
 src/{Main => Viewer}/WindowBuilder.cxx       |  2 +-
 src/{Main => Viewer}/WindowBuilder.hxx       |  0
 src/{Main => Viewer}/WindowSystemAdapter.cxx |  0
 src/{Main => Viewer}/WindowSystemAdapter.hxx |  0
 src/{Main => Viewer}/fg_os_osgviewer.cxx     |  8 +++---
 src/{Main => Viewer}/fgviewer.cxx            |  8 +++---
 src/{Main => Viewer}/fgviewer.hxx            |  0
 src/{Main => Viewer}/renderer.cxx            |  6 ++---
 src/{Main => Viewer}/renderer.hxx            |  0
 src/{Main => Viewer}/splash.cxx              |  6 ++---
 src/{Main => Viewer}/splash.hxx              |  0
 src/{Main => Viewer}/viewer.cxx              |  3 +--
 src/{Main => Viewer}/viewer.hxx              |  0
 src/{Main => Viewer}/viewmgr.cxx             |  2 +-
 src/{Main => Viewer}/viewmgr.hxx             |  0
 51 files changed, 105 insertions(+), 94 deletions(-)
 create mode 100644 src/Viewer/CMakeLists.txt
 rename src/{Main => Viewer}/CameraGroup.cxx (99%)
 rename src/{Main => Viewer}/CameraGroup.hxx (100%)
 rename src/{Main => Viewer}/FGEventHandler.cxx (100%)
 rename src/{Main => Viewer}/FGEventHandler.hxx (99%)
 rename src/{Main => Viewer}/WindowBuilder.cxx (99%)
 rename src/{Main => Viewer}/WindowBuilder.hxx (100%)
 rename src/{Main => Viewer}/WindowSystemAdapter.cxx (100%)
 rename src/{Main => Viewer}/WindowSystemAdapter.hxx (100%)
 rename src/{Main => Viewer}/fg_os_osgviewer.cxx (99%)
 rename src/{Main => Viewer}/fgviewer.cxx (98%)
 rename src/{Main => Viewer}/fgviewer.hxx (100%)
 rename src/{Main => Viewer}/renderer.cxx (99%)
 rename src/{Main => Viewer}/renderer.hxx (100%)
 rename src/{Main => Viewer}/splash.cxx (99%)
 rename src/{Main => Viewer}/splash.hxx (100%)
 rename src/{Main => Viewer}/viewer.cxx (99%)
 rename src/{Main => Viewer}/viewer.hxx (100%)
 rename src/{Main => Viewer}/viewmgr.cxx (99%)
 rename src/{Main => Viewer}/viewmgr.hxx (100%)

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 408dfb4a1..0a1050863 100644
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -25,7 +25,7 @@
 #include <simgear/route/waypoint.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Airports/dynamics.hxx>
diff --git a/src/AIModel/AICarrier.cxx b/src/AIModel/AICarrier.cxx
index dc8cde561..8a39b1467 100644
--- a/src/AIModel/AICarrier.cxx
+++ b/src/AIModel/AICarrier.cxx
@@ -31,7 +31,7 @@
 
 #include <math.h>
 #include <Main/util.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include "AICarrier.hxx"
 
diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx
index 9d19ce4b4..b3218ecee 100644
--- a/src/AIModel/AIEscort.cxx
+++ b/src/AIModel/AIEscort.cxx
@@ -32,7 +32,7 @@
 
 #include <math.h>
 #include <Main/util.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include <Scenery/scenery.hxx>
 
diff --git a/src/AIModel/AIGroundVehicle.cxx b/src/AIModel/AIGroundVehicle.cxx
index e6df8d302..f5f2b8832 100644
--- a/src/AIModel/AIGroundVehicle.cxx
+++ b/src/AIModel/AIGroundVehicle.cxx
@@ -24,7 +24,7 @@
 
 #include <simgear/sg_inlines.h>
 
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Airports/dynamics.hxx>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e558433a8..ab32ec186 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,9 +27,11 @@ foreach( mylibfolder
 		Time
 		Traffic
 		FDM
+		Viewer
 		Main
-    )
+	)
+
+	add_subdirectory(${mylibfolder})
 
-    add_subdirectory(${mylibfolder})
 endforeach( mylibfolder )
 
diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 0eb1f96f2..bc8f220ba 100644
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -57,10 +57,10 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <Time/light.hxx>
 #include <GUI/FGFontCache.hxx>	
-#include <Main/viewer.hxx>
 #include <Instrumentation/dclgps.hxx>
 
 #define WIN_X 0
diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index cc74f9955..f13d9e88f 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -31,8 +31,8 @@
 #include <simgear/structure/event_mgr.hxx>
 
 #include <Main/main.hxx>
-#include <Main/renderer.hxx>
 #include <Main/fg_props.hxx>
+#include <Viewer/renderer.hxx>
 #include <FDM/flight.hxx>
 
 #include "environment.hxx"
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 609085133..d5db1ed20 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -38,9 +38,9 @@
 #include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
-#include <Airports/simple.hxx>
 #include <Main/util.hxx>
+#include <Viewer/renderer.hxx>
+#include <Airports/simple.hxx>
 
 #include "fgclouds.hxx"
 
diff --git a/src/Environment/precipitation_mgr.cxx b/src/Environment/precipitation_mgr.cxx
index b3dd6e480..e4ca0c0f6 100644
--- a/src/Environment/precipitation_mgr.cxx
+++ b/src/Environment/precipitation_mgr.cxx
@@ -39,7 +39,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Scenery/scenery.hxx>
 
 #include "precipitation_mgr.hxx"
diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 851f5dbb3..f9a169259 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -43,7 +43,7 @@
 #include <Main/globals.hxx>
 #include <Main/locale.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/WindowSystemAdapter.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
 #include <GUI/new_gui.hxx>
 #include <GUI/FGFontCache.hxx>
 
diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 6cd2a95bf..22e3e6a8c 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -49,10 +49,10 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/fg_os.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/WindowSystemAdapter.hxx>
-#include <Main/CameraGroup.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/CameraGroup.hxx>
 #include <GUI/new_gui.hxx>
 
 
diff --git a/src/Input/FGMouseInput.hxx b/src/Input/FGMouseInput.hxx
index 7b9705713..ba0054ca0 100644
--- a/src/Input/FGMouseInput.hxx
+++ b/src/Input/FGMouseInput.hxx
@@ -37,7 +37,8 @@
 #include <list>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/scene/util/SGPickCallback.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
+
 /**
   * List of currently pressed mouse button events
   */
diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 762b206fc..8c112aef6 100644
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -37,8 +37,8 @@
 #include <plib/fnt.h>
 
 #include <Main/globals.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <GUI/FGFontCache.hxx>
 
 #include "HUD.hxx"
diff --git a/src/Instrumentation/HUD/HUD_ladder.cxx b/src/Instrumentation/HUD/HUD_ladder.cxx
index 9b4ba1084..37a9f292c 100644
--- a/src/Instrumentation/HUD/HUD_ladder.cxx
+++ b/src/Instrumentation/HUD/HUD_ladder.cxx
@@ -25,7 +25,7 @@
 
 #include <sstream>
 #include <simgear/math/SGGeometry.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/viewer.hxx>
 #include "HUD.hxx"
 
 // FIXME
diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx
index b115b3ae7..f44a6d3a5 100644
--- a/src/Instrumentation/HUD/HUD_runway.cxx
+++ b/src/Instrumentation/HUD/HUD_runway.cxx
@@ -33,8 +33,8 @@
 #include <FDM/flight.hxx>
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
-#include <Main/viewer.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
 #include <ATCDCL/ATCutils.hxx>
 
 #include "HUD.hxx"
diff --git a/src/Instrumentation/groundradar.cxx b/src/Instrumentation/groundradar.cxx
index 2669d2ab1..b7d283413 100644
--- a/src/Instrumentation/groundradar.cxx
+++ b/src/Instrumentation/groundradar.cxx
@@ -36,7 +36,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Cockpit/panel.hxx>
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Instrumentation/od_gauge.cxx b/src/Instrumentation/od_gauge.cxx
index ad79f021a..6760bcd22 100644
--- a/src/Instrumentation/od_gauge.cxx
+++ b/src/Instrumentation/od_gauge.cxx
@@ -42,7 +42,7 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Scenery/scenery.hxx>
 #include "od_gauge.hxx"
 
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index d136da9cb..017a29c8a 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -8,51 +8,32 @@ if (MSVC)
 endif (MSVC)
 
 set(SOURCES
-	CameraGroup.cxx
-	FGEventHandler.cxx
-	WindowBuilder.cxx
-	WindowSystemAdapter.cxx
 	bootstrap.cxx
 	fg_commands.cxx
 	fg_init.cxx
 	fg_io.cxx
 	fg_os_common.cxx
-	fg_os_osgviewer.cxx
 	fg_props.cxx
-	fgviewer.cxx
 	globals.cxx
 	locale.cxx
 	logger.cxx
 	main.cxx
 	options.cxx
-	renderer.cxx
-	splash.cxx
 	util.cxx
-	viewer.cxx
-	viewmgr.cxx
 	${RESOURCE_FILE}
 	)
 
 set(HEADERS
-	CameraGroup.hxx
-	FGEventHandler.hxx
-	WindowBuilder.hxx
-	WindowSystemAdapter.hxx
 	fg_commands.hxx
 	fg_init.hxx
 	fg_io.hxx
 	fg_props.hxx
-	fgviewer.hxx
 	globals.hxx
 	locale.hxx
 	logger.hxx
 	main.hxx
 	options.hxx
-	renderer.hxx
-	splash.hxx
 	util.hxx
-	viewer.hxx
-	viewmgr.hxx
 	)
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index a5d5c2a47..0f43f766a 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -57,10 +57,10 @@
 using std::cerr;
 using std::endl;
 
+#include <Viewer/fgviewer.hxx>
 #include "main.hxx"
 #include "globals.hxx"
 #include "fg_props.hxx"
-#include "fgviewer.hxx"
 
 
 #include "fg_os.hxx"
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 60822e2d9..4c7e0ffaf 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -38,6 +38,9 @@
 #include <Sound/sample_queue.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Network/HTTPClient.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
+#include <Environment/presets.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -47,10 +50,7 @@
 #include "globals.hxx"
 #include "logger.hxx"
 #include "util.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
-#include <Main/viewer.hxx>
-#include <Environment/presets.hxx>
 
 #include <boost/scoped_array.hpp>
 
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 134a34416..e1bcc0621 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -109,6 +109,8 @@
 #include <FDM/fdm_shell.hxx>
 #include <Environment/ephemeris.hxx>
 #include <Environment/environment_mgr.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include "fg_init.hxx"
 #include "fg_io.hxx"
@@ -117,8 +119,6 @@
 #include "options.hxx"
 #include "globals.hxx"
 #include "logger.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
 
 
diff --git a/src/Main/fg_os_common.cxx b/src/Main/fg_os_common.cxx
index cba760bb9..3dd07c610 100644
--- a/src/Main/fg_os_common.cxx
+++ b/src/Main/fg_os_common.cxx
@@ -24,10 +24,10 @@
 #include <plib/pu.h>
 #include <osg/GraphicsContext>
 
+#include <Viewer/renderer.hxx>
+#include <Viewer/FGEventHandler.hxx>
 #include "fg_os.hxx"
 #include "globals.hxx"
-#include "renderer.hxx"
-#include "FGEventHandler.hxx"
 
 // fg_os callback registration APIs
 //
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 8adcd57ca..2dd696ba9 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -55,10 +55,10 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Navaids/navlist.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include "globals.hxx"
-#include "renderer.hxx"
-#include "viewmgr.hxx"
 #include "locale.hxx"
 
 #include "fg_props.hxx"
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index dc6043af8..ac3880f29 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -70,19 +70,19 @@
 #include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>
+#include <Viewer/CameraGroup.hxx>
+#include <Viewer/viewer.hxx>
+#include <Viewer/WindowSystemAdapter.hxx>
+#include <Viewer/splash.hxx>
+#include <Viewer/renderer.hxx>
 
-#include "CameraGroup.hxx"
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
-#include "renderer.hxx"
-#include "splash.hxx"
 #include "main.hxx"
 #include "util.hxx"
 #include "fg_init.hxx"
 #include "fg_os.hxx"
-#include "WindowSystemAdapter.hxx"
-#include <Main/viewer.hxx>
-#include <Main/fg_props.hxx>
+#include "fg_props.hxx"
 
 using namespace flightgear;
 
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index aba0650fe..52df477ac 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -57,10 +57,10 @@
 #include "fg_props.hxx"
 #include "options.hxx"
 #include "util.hxx"
-#include "viewmgr.hxx"
 #include "main.hxx"
-#include <Main/viewer.hxx>
-#include <Main/locale.hxx>
+#include "locale.hxx"
+#include <Viewer/viewer.hxx>
+#include <Viewer/viewmgr.hxx>
 #include <Environment/presets.hxx>
 
 #include <osg/Version>
diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index d4e8c0f48..51f4082f3 100644
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -18,9 +18,9 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewmgr.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewmgr.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scenery/scenery.hxx>
 #include <Sound/fg_fx.hxx>
 
diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index 55e5e79c0..b1ba76dc1 100644
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -42,7 +42,7 @@
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 
 #include "jpg-httpd.hxx"
 
diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 7240d5cb2..1fd2971eb 100644
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -39,7 +39,7 @@
 #include <errno.h>
 
 #include <Main/globals.hxx>
-#include <Main/viewmgr.hxx>
+#include <Viewer/viewmgr.hxx>
 
 #include <simgear/io/sg_netChat.hxx>
 
diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 908f4da22..eeec77bb4 100644
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -45,7 +45,7 @@
 #include <simgear/scene/bvh/BVHNode.hxx>
 #include <simgear/scene/bvh/BVHLineSegmentVisitor.hxx>
 
-#include <Main/renderer.hxx>
+#include <Viewer/renderer.hxx>
 #include <Main/fg_props.hxx>
 
 #include "tilemgr.hxx"
diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 347131655..5a9679221 100644
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -40,8 +40,8 @@
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewer.hxx>
 #include <Scripting/NasalSys.hxx>
 
 #include "scenery.hxx"
diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index bcd6ebf69..0c3face55 100644
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -42,8 +42,8 @@
 #include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
-#include <Main/renderer.hxx>
-#include <Main/viewer.hxx>
+#include <Viewer/renderer.hxx>
+#include <Viewer/viewer.hxx>
 
 #include "light.hxx"
 #include "sunsolver.hxx"
diff --git a/src/Viewer/CMakeLists.txt b/src/Viewer/CMakeLists.txt
new file mode 100644
index 000000000..7b7bd0aa3
--- /dev/null
+++ b/src/Viewer/CMakeLists.txt
@@ -0,0 +1,28 @@
+include(FlightGearComponent)
+
+set(SOURCES
+	CameraGroup.cxx
+	FGEventHandler.cxx
+	WindowBuilder.cxx
+	WindowSystemAdapter.cxx
+	fg_os_osgviewer.cxx
+	fgviewer.cxx
+	renderer.cxx
+	splash.cxx
+	viewer.cxx
+	viewmgr.cxx
+	)
+
+set(HEADERS
+	CameraGroup.hxx
+	FGEventHandler.hxx
+	WindowBuilder.hxx
+	WindowSystemAdapter.hxx
+	fgviewer.hxx
+	renderer.hxx
+	splash.hxx
+	viewer.hxx
+	viewmgr.hxx
+	)
+
+flightgear_component(Viewer "${SOURCES}" "${HEADERS}")
diff --git a/src/Main/CameraGroup.cxx b/src/Viewer/CameraGroup.cxx
similarity index 99%
rename from src/Main/CameraGroup.cxx
rename to src/Viewer/CameraGroup.cxx
index 495da49c1..4adbbfa50 100644
--- a/src/Main/CameraGroup.cxx
+++ b/src/Viewer/CameraGroup.cxx
@@ -21,8 +21,8 @@
 
 #include "CameraGroup.hxx"
 
-#include "fg_props.hxx"
-#include "globals.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 #include "renderer.hxx"
 #include "FGEventHandler.hxx"
 #include "WindowBuilder.hxx"
diff --git a/src/Main/CameraGroup.hxx b/src/Viewer/CameraGroup.hxx
similarity index 100%
rename from src/Main/CameraGroup.hxx
rename to src/Viewer/CameraGroup.hxx
diff --git a/src/Main/FGEventHandler.cxx b/src/Viewer/FGEventHandler.cxx
similarity index 100%
rename from src/Main/FGEventHandler.cxx
rename to src/Viewer/FGEventHandler.cxx
diff --git a/src/Main/FGEventHandler.hxx b/src/Viewer/FGEventHandler.hxx
similarity index 99%
rename from src/Main/FGEventHandler.hxx
rename to src/Viewer/FGEventHandler.hxx
index 9eed4840f..2e38c411c 100644
--- a/src/Main/FGEventHandler.hxx
+++ b/src/Viewer/FGEventHandler.hxx
@@ -7,7 +7,7 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <simgear/structure/OSGVersion.hxx>
 
-#include "fg_os.hxx"
+#include <Main/fg_os.hxx>
 
 namespace flightgear
 {
diff --git a/src/Main/WindowBuilder.cxx b/src/Viewer/WindowBuilder.cxx
similarity index 99%
rename from src/Main/WindowBuilder.cxx
rename to src/Viewer/WindowBuilder.cxx
index 239a5e675..f48ea0e1d 100644
--- a/src/Main/WindowBuilder.cxx
+++ b/src/Viewer/WindowBuilder.cxx
@@ -21,7 +21,7 @@
 #include "WindowBuilder.hxx"
 
 #include "WindowSystemAdapter.hxx"
-#include "fg_props.hxx"
+#include <Main/fg_props.hxx>
 
 #include <sstream>
 
diff --git a/src/Main/WindowBuilder.hxx b/src/Viewer/WindowBuilder.hxx
similarity index 100%
rename from src/Main/WindowBuilder.hxx
rename to src/Viewer/WindowBuilder.hxx
diff --git a/src/Main/WindowSystemAdapter.cxx b/src/Viewer/WindowSystemAdapter.cxx
similarity index 100%
rename from src/Main/WindowSystemAdapter.cxx
rename to src/Viewer/WindowSystemAdapter.cxx
diff --git a/src/Main/WindowSystemAdapter.hxx b/src/Viewer/WindowSystemAdapter.hxx
similarity index 100%
rename from src/Main/WindowSystemAdapter.hxx
rename to src/Viewer/WindowSystemAdapter.hxx
diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Viewer/fg_os_osgviewer.cxx
similarity index 99%
rename from src/Main/fg_os_osgviewer.cxx
rename to src/Viewer/fg_os_osgviewer.cxx
index e8ba901a2..3600a65ee 100644
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Viewer/fg_os_osgviewer.cxx
@@ -48,10 +48,10 @@
 #include <osgViewer/GraphicsWindow>
 
 #include <Scenery/scenery.hxx>
-#include "fg_os.hxx"
-#include "fg_props.hxx"
-#include "util.hxx"
-#include "globals.hxx"
+#include <Main/fg_os.hxx>
+#include <Main/fg_props.hxx>
+#include <Main/util.hxx>
+#include <Main/globals.hxx>
 #include "renderer.hxx"
 #include "CameraGroup.hxx"
 #include "FGEventHandler.hxx"
diff --git a/src/Main/fgviewer.cxx b/src/Viewer/fgviewer.cxx
similarity index 98%
rename from src/Main/fgviewer.cxx
rename to src/Viewer/fgviewer.cxx
index 73c3cb2aa..7b4a83088 100644
--- a/src/Main/fgviewer.cxx
+++ b/src/Viewer/fgviewer.cxx
@@ -32,10 +32,10 @@
 
 #include <Scenery/scenery.hxx>
 
-#include "fg_init.hxx"
-#include "fg_props.hxx"
-#include "globals.hxx"
-#include "options.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
+#include <Main/options.hxx>
+#include <Main/fg_init.hxx>
 
 class GraphDumpHandler : public  osgGA::GUIEventHandler
 {
diff --git a/src/Main/fgviewer.hxx b/src/Viewer/fgviewer.hxx
similarity index 100%
rename from src/Main/fgviewer.hxx
rename to src/Viewer/fgviewer.hxx
diff --git a/src/Main/renderer.cxx b/src/Viewer/renderer.cxx
similarity index 99%
rename from src/Main/renderer.cxx
rename to src/Viewer/renderer.cxx
index c1e2b32b7..3fa0755bd 100644
--- a/src/Main/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -100,13 +100,13 @@
 #include <Environment/precipitation_mgr.hxx>
 #include <Environment/environment_mgr.hxx>
 
+//#include <Main/main.hxx>
+#include "viewer.hxx"
+#include "viewmgr.hxx"
 #include "splash.hxx"
 #include "renderer.hxx"
-#include "main.hxx"
 #include "CameraGroup.hxx"
 #include "FGEventHandler.hxx"
-#include <Main/viewer.hxx>
-#include <Main/viewmgr.hxx>
 
 using namespace osg;
 using namespace simgear;
diff --git a/src/Main/renderer.hxx b/src/Viewer/renderer.hxx
similarity index 100%
rename from src/Main/renderer.hxx
rename to src/Viewer/renderer.hxx
diff --git a/src/Main/splash.cxx b/src/Viewer/splash.cxx
similarity index 99%
rename from src/Main/splash.cxx
rename to src/Viewer/splash.cxx
index a170a31f1..78d79aa0b 100644
--- a/src/Main/splash.cxx
+++ b/src/Viewer/splash.cxx
@@ -51,11 +51,11 @@
 #include "GUI/FGFontCache.hxx"
 #include "GUI/FGColor.hxx"
 
-#include "globals.hxx"
-#include "fg_props.hxx"
+#include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
+#include <Main/fg_os.hxx>
 #include "splash.hxx"
 #include "renderer.hxx"
-#include "fg_os.hxx"
 
 class FGSplashUpdateCallback : public osg::Drawable::UpdateCallback {
 public:
diff --git a/src/Main/splash.hxx b/src/Viewer/splash.hxx
similarity index 100%
rename from src/Main/splash.hxx
rename to src/Viewer/splash.hxx
diff --git a/src/Main/viewer.cxx b/src/Viewer/viewer.cxx
similarity index 99%
rename from src/Main/viewer.cxx
rename to src/Viewer/viewer.cxx
index 97ae34519..d26b282b5 100644
--- a/src/Main/viewer.cxx
+++ b/src/Viewer/viewer.cxx
@@ -30,13 +30,12 @@
 #include <simgear/compiler.h>
 #include <cassert>
 
-#include "fg_props.hxx"
-
 #include <simgear/debug/logstream.hxx>
 #include <simgear/constants.h>
 #include <simgear/scene/model/placement.hxx>
 #include <simgear/scene/util/OsgMath.hxx>
 
+#include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <Model/acmodel.hxx>
diff --git a/src/Main/viewer.hxx b/src/Viewer/viewer.hxx
similarity index 100%
rename from src/Main/viewer.hxx
rename to src/Viewer/viewer.hxx
diff --git a/src/Main/viewmgr.cxx b/src/Viewer/viewmgr.cxx
similarity index 99%
rename from src/Main/viewmgr.cxx
rename to src/Viewer/viewmgr.cxx
index 32e7390ea..f3101a21a 100644
--- a/src/Main/viewmgr.cxx
+++ b/src/Viewer/viewmgr.cxx
@@ -32,8 +32,8 @@
 #include <simgear/compiler.h>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <Model/acmodel.hxx>
-#include <Main/viewer.hxx>
 #include <Main/fg_props.hxx>
+#include "viewer.hxx"
 
 // Constructor
 FGViewMgr::FGViewMgr( void ) :
diff --git a/src/Main/viewmgr.hxx b/src/Viewer/viewmgr.hxx
similarity index 100%
rename from src/Main/viewmgr.hxx
rename to src/Viewer/viewmgr.hxx
-- 
2.39.5