From bf7cf64eb22477aeb712aeaeff617530353b5eb7 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sun, 6 Nov 2005 02:40:08 +0000
Subject: [PATCH] Updates in preparation for the v0.9.9 coming sometime
 [hopefully] soon.

---
 FlightGear.dsp             | 541 ++++++++++++++++++++++++++++++-------
 Makefile.am                |   2 +-
 NEWS                       |  60 ++++
 configure.ac               |   8 +-
 src/Main/main.cxx          |   2 +-
 utils/Makefile.am          |   2 +-
 utils/fgadmin/configure.ac |  10 +-
 7 files changed, 511 insertions(+), 114 deletions(-)

diff --git a/FlightGear.dsp b/FlightGear.dsp
index a42a32ad5..4c86c6d62 100644
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -96,6 +96,66 @@ SOURCE=.\src\Aircraft\aircraft.hxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Aircraft\controls.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Aircraft"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Aircraft"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Aircraft\controls.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Aircraft"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Aircraft"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Aircraft\replay.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Aircraft"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Aircraft"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Aircraft\replay.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Aircraft"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Aircraft"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Airports"
@@ -1198,46 +1258,72 @@ SOURCE=.\src\Cockpit\built_in\FGMagRibbon.hxx
 
 # End Source File
 # End Group
-# Begin Group "Lib_Controls"
+# Begin Group "Lib_Environment"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\Controls\controls.cxx
+SOURCE=.\src\Environment\environment.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Environment\environment.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\Lib_Controls"
+# PROP Intermediate_Dir "Release\Lib_Environment"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\Lib_Controls"
+# PROP Intermediate_Dir "Debug\Lib_Environment"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Controls\controls.hxx
+SOURCE=.\src\Environment\environment_mgr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\Lib_Controls"
+# PROP Intermediate_Dir "Release\Lib_Environment"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\Lib_Controls"
+# PROP Intermediate_Dir "Debug\Lib_Environment"
 
 !ENDIF 
 
 # End Source File
-# End Group
-# Begin Group "Lib_Environment"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\src\Environment\environment_mgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
+# End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment.cxx
+SOURCE=.\src\Environment\environment_ctrl.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1252,7 +1338,7 @@ SOURCE=.\src\Environment\environment.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment.hxx
+SOURCE=.\src\Environment\environment_ctrl.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1267,7 +1353,7 @@ SOURCE=.\src\Environment\environment.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment_mgr.cxx
+SOURCE=.\src\Environment\fgmetar.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1282,7 +1368,7 @@ SOURCE=.\src\Environment\environment_mgr.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment_mgr.hxx
+SOURCE=.\src\Environment\fgmetar.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1297,7 +1383,7 @@ SOURCE=.\src\Environment\environment_mgr.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment_ctrl.cxx
+SOURCE=.\src\Environment\fgclouds.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1312,7 +1398,7 @@ SOURCE=.\src\Environment\environment_ctrl.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Environment\environment_ctrl.hxx
+SOURCE=.\src\Environment\fgclouds.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2693,6 +2779,36 @@ SOURCE=.\src\FDM\JSBSim\FGElectric.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\JSBSim\FGGroundCallback.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\JSBSim\FGGroundCallback.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\JSBSim\JSBSim.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -4059,21 +4175,6 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_aerodeflections.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_aircraftdir.h
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_UIUCModel"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\FDM\UIUCModel\uiuc_aircraft.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -6253,6 +6354,36 @@ SOURCE=.\src\FDM\YASim\YASim.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\YASim\FGGround.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\FGGround.hpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\YASim\Airplane.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -6448,6 +6579,96 @@ SOURCE=.\src\FDM\YASim\Glue.hpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\FDM\YASim\Ground.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Ground.hpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Hook.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Hook.hpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Launchbar.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\YASim\Launchbar.hpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_YASim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_YASim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\FDM\YASim\Integrator.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -7356,6 +7577,21 @@ SOURCE=.\src\GUI\mouse.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\GUI\fonts.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_GUI"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_GUI"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\GUI\preset_dlg.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -8246,6 +8482,126 @@ SOURCE=.\src\Instrumentation\vertical_speed_indicator.hxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\od_gauge.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\od_gauge.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\wxradar.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\wxradar.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\tacan.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Instrumentation\tacan.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "main"
@@ -9090,6 +9446,21 @@ SOURCE=.\src\AIModel\AIFlightPlan.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\AIModel\AIFlightPlanCreate.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\AIModel\AIScenario.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -9147,6 +9518,36 @@ SOURCE=.\src\AIModel\AICarrier.cxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIStatic.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\AIModel\AIStatic.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_AIModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_AIModel"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_MultiPlayer"
@@ -9154,7 +9555,7 @@ SOURCE=.\src\AIModel\AICarrier.cxx
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\multiplayrxmgr.cxx
+SOURCE=.\src\MultiPlayer\multiplaymgr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9169,7 +9570,7 @@ SOURCE=.\src\MultiPlayer\multiplayrxmgr.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\multiplayrxmgr.hxx
+SOURCE=.\src\MultiPlayer\multiplaymgr.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9184,7 +9585,7 @@ SOURCE=.\src\MultiPlayer\multiplayrxmgr.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\multiplaytxmgr.cxx
+SOURCE=.\src\MultiPlayer\mpplayer.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9199,7 +9600,7 @@ SOURCE=.\src\MultiPlayer\multiplaytxmgr.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\multiplaytxmgr.hxx
+SOURCE=.\src\MultiPlayer\mpplayer.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9214,7 +9615,7 @@ SOURCE=.\src\MultiPlayer\multiplaytxmgr.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\mpplayer.cxx
+SOURCE=.\src\MultiPlayer\mpmessages.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9229,7 +9630,7 @@ SOURCE=.\src\MultiPlayer\mpplayer.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\mpplayer.hxx
+SOURCE=.\src\MultiPlayer\tiny_xdr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -9244,7 +9645,7 @@ SOURCE=.\src\MultiPlayer\mpplayer.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\MultiPlayer\mpmessages.hxx
+SOURCE=.\src\MultiPlayer\tiny_xdr.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -10074,40 +10475,6 @@ SOURCE=.\src\Network\generic.cxx
 
 !ENDIF 
 
-# End Source File
-# End Group
-# Begin Group "Lib_Replay"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\Replay\replay.hxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Replay"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Replay"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\Replay\replay.cxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Replay"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Replay"
-
-!ENDIF 
-
 # End Source File
 # End Group
 # Begin Group "Lib_Scenery"
@@ -10656,36 +11023,6 @@ SOURCE=.\src\Time\light.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Time\moonpos.cxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Time"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Time"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\Time\moonpos.hxx
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_Time"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_Time"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\Time\sunpos.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
diff --git a/Makefile.am b/Makefile.am
index 0a10c124f..085951010 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = \
 	FlightGear.dsw
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
 	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
 		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
 
diff --git a/NEWS b/NEWS
index 707b4d952..c6e69280e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,63 @@
+New in 0.9.9-pre1
+* November 5, 2005
+
+* New well integrated volumetric clouds by Harald Johnsen
+* Removed 'old' 3D clouds code.
+* Fixed the jitter problem with 3d cockpits.
+* Volumetric shadows are now supported so that aircraft can cast
+  shadows upon themselves as well as the ground.
+* Better support for redoing livery textures on an individual aircraft.
+* Support for seasonal terrain textures.  (Updates to summer textures
+  plus new winter textures added.)
+* Add status updates to the initial splash/startup screen.
+* Allow switching the tower view location at any time.
+* Add support for configuring views with asymmetric view frustums.
+* Many updates to gui/dialog box infrastructure.  Ability to alter
+  border thickness, change fonts, dialog boxes are draggable across
+  the screen, you can enable automatic line wrapping, select
+  colors, allow key presses to be bound to widgets, .
+* Updates and enhancements to many of the dialog boxes to fix problems,
+  expose new features, enhance usability, etc.
+
+* Updated JSBSim version since the last release.  (More updates
+  pending after this release.)
+* YASim: expose "spool-time" of a jet engine as a config parameter,
+  add an oil temp model, support gear compression along any arbitrary axis,
+  reworked MP calculations for super/turbochargers.
+* Allow setting individual sample/update rates for any of the PID
+  autopilot stages.
+
+* Support TACAN instruments.  And an IVSI instrument.
+* Depricated old (somewhat less the spectacularly conceived)
+  electrical system model in favor of a much more flexible script based
+  system that can be tailored to any individual aircraft.
+* Include an external utility that can feed saved nmea tracks back
+  into FlightGear.  If you take a gps on a real flight with you and
+  capture the output, you can replay your flight in FlightGear.
+
+* Many updates and fixes to the joystick configuration files, many new
+  joysticks directly supported.
+
+* Removed all lingering dependencies on plib's SL sound library.
+* Add support for OpenAL 1.1 and alut.
+* Better cross platform compatibility with our standard network structures.
+* More cpu friendly frame rate throttling code that can leave more cpu
+  available for other apps.
+* Various Nasal (scripting) bug fixes and language improvements.
+* Various bug fixes, various platform/compiler compatibility fixes,
+  several memory leaks fixed.
+
+* New aircraft available (in various stages of developement): A380,
+  Boeing 314 (seaplane), Citation Bravo (glass cockpit), F-8E
+  Crusader, Hurricane IIb, MiG-15bis, TU-114, B29, C150, and SR20.
+
+* Aircraft that have had updates since the last release: 737, A-10,
+  AN-225, B-52F, BAC-TSR2, Citation-II (550), Comper Swift, Concorde,
+  Hunter, OV10, Spitfire, T37, B1900d, bo105, C172 et. al., DHC2F
+  (Beaver), F16, Fokker DR1 Triplane, Fokker 50 (turboprop), Fokker
+  100 (jet), J3 Cub, P51, Santa, Seahawk, and 1903 Wright Flyer.
+  
+
 New in 0.9.8
 * January 18, 2005
 
diff --git a/configure.ac b/configure.ac
index 252e20e17..2af7fb8d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.8)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.9-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -364,7 +364,7 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.8.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
@@ -386,7 +386,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.8 or newer])
+AC_MSG_CHECKING([for simgear 0.3.9 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -397,7 +397,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 8
+#define MIN_MICRO 9
 
 int main() {
     int major, minor, micro;
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index c5fd29ab4..b75af68f7 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -941,7 +941,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.8";
+    static char required_version[] = "0.9.9-pre1";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 01c92494e..e73dcc1e9 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = TerraSync Modeller js_server fgadmin xmlgrep
+DIST_SUBDIRS = GPSsmooth TerraSync Modeller js_server fgadmin xmlgrep
 
 SUBDIRS = GPSsmooth TerraSync Modeller js_server
 
diff --git a/utils/fgadmin/configure.ac b/utils/fgadmin/configure.ac
index 5aec143c0..aaf15c13d 100644
--- a/utils/fgadmin/configure.ac
+++ b/utils/fgadmin/configure.ac
@@ -48,16 +48,16 @@ AC_CHECK_HEADER(windows.h)
 
 dnl Checks for libraries.
 
-AC_CHECK_LIB(fltk,main,LIBS="$LIBS `fltk-config --use-images --ldflags`"
-             LDFLAGS="$LDFLAGS `fltk-config --use-images --ldflags`"
-	     CPPFLAGS="$CPPFLAGS `fltk-config --cxxflags`",
-  AC_MSG_ERROR(fltk library required get it at http://www.fltk.org))
-
 # The following are C++ items that need to be tested for with the c++
 # compiler
 
 AC_LANG_PUSH(C++)
 
+AC_CHECK_LIB(fltk,main,LIBS="$LIBS `fltk-config --use-images --ldflags`"
+             LDFLAGS="$LDFLAGS `fltk-config --use-images --ldflags`"
+	     CPPFLAGS="$CPPFLAGS `fltk-config --cxxflags`",
+  AC_MSG_ERROR(fltk library required get it at http://www.fltk.org))
+
 # Check for "plib" without which we cannot go on
 AC_CHECK_HEADER(plib/ul.h)
 if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
-- 
2.39.2