- Update FlightGear.dsp

- Assign an arbitrary prerelease version number
- Tweaks to top level Makefile.am

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 593c9766dbc065cf410053e6f409afa779c806a6..a7cb147ee4825120c17a7d2b82bf1348b2497b34 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -313,6 +313,36 @@ SOURCE=.\src\Airports\parking.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Airports\gnnode.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Airports\gnnode.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\Airports\groundnetwork.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -373,7 +403,67 @@ SOURCE=.\src\Airports\dynamics.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Airports\trafficcontrol.hxx\r
+SOURCE=.\src\Airports\dynamicloader.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Airports\dynamicloader.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Airports\runwayprefloader.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Airports\runwayprefloader.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Airports"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Airports"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Airports\xmlloader.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -388,7 +478,7 @@ SOURCE=.\src\Airports\trafficcontrol.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Airports\trafficcontrol.cxx\r
+SOURCE=.\src\Airports\xmlloader.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -407,7 +497,7 @@ SOURCE=.\src\Airports\trafficcontrol.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATC.hxx\r
+SOURCE=.\src\ATC\trafficcontrol.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -422,7 +512,7 @@ SOURCE=.\src\ATC\ATC.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATC.cxx\r
+SOURCE=.\src\ATC\trafficcontrol.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -435,542 +525,546 @@ SOURCE=.\src\ATC\ATC.cxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_ATCDCL"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\atis.hxx\r
+SOURCE=.\src\ATCDCL\ATC.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\atis.cxx\r
+SOURCE=.\src\ATCDCL\ATC.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\tower.hxx\r
+SOURCE=.\src\ATCDCL\atis.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\tower.cxx\r
+SOURCE=.\src\ATCDCL\atis.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\approach.hxx\r
+SOURCE=.\src\ATCDCL\tower.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\approach.cxx\r
+SOURCE=.\src\ATCDCL\tower.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ground.hxx\r
+SOURCE=.\src\ATCDCL\approach.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ground.cxx\r
+SOURCE=.\src\ATCDCL\approach.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\commlist.hxx\r
+SOURCE=.\src\ATCDCL\ground.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\commlist.cxx\r
+SOURCE=.\src\ATCDCL\ground.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCDialog.hxx\r
+SOURCE=.\src\ATCDCL\commlist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCDialog.cxx\r
+SOURCE=.\src\ATCDCL\commlist.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCdisplay.hxx\r
+SOURCE=.\src\ATCDCL\ATCDialog.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCdisplay.cxx\r
+SOURCE=.\src\ATCDCL\ATCDialog.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCVoice.hxx\r
+SOURCE=.\src\ATCDCL\ATCVoice.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCVoice.cxx\r
+SOURCE=.\src\ATCDCL\ATCVoice.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCmgr.hxx\r
+SOURCE=.\src\ATCDCL\ATCmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCmgr.cxx\r
+SOURCE=.\src\ATCDCL\ATCmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCutils.hxx\r
+SOURCE=.\src\ATCDCL\ATCutils.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCutils.cxx\r
+SOURCE=.\src\ATCDCL\ATCutils.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCProjection.hxx\r
+SOURCE=.\src\ATCDCL\ATCProjection.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\ATCProjection.cxx\r
+SOURCE=.\src\ATCDCL\ATCProjection.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIMgr.hxx\r
+SOURCE=.\src\ATCDCL\AIMgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIMgr.cxx\r
+SOURCE=.\src\ATCDCL\AIMgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIEntity.hxx\r
+SOURCE=.\src\ATCDCL\AIEntity.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIEntity.cxx\r
+SOURCE=.\src\ATCDCL\AIEntity.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIPlane.hxx\r
+SOURCE=.\src\ATCDCL\AIPlane.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIPlane.cxx\r
+SOURCE=.\src\ATCDCL\AIPlane.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AILocalTraffic.hxx\r
+SOURCE=.\src\ATCDCL\AILocalTraffic.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AILocalTraffic.cxx\r
+SOURCE=.\src\ATCDCL\AILocalTraffic.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIGAVFRTraffic.hxx\r
+SOURCE=.\src\ATCDCL\AIGAVFRTraffic.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\AIGAVFRTraffic.cxx\r
+SOURCE=.\src\ATCDCL\AIGAVFRTraffic.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\transmission.hxx\r
+SOURCE=.\src\ATCDCL\transmission.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\transmission.cxx\r
+SOURCE=.\src\ATCDCL\transmission.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\transmissionlist.hxx\r
+SOURCE=.\src\ATCDCL\transmissionlist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\transmissionlist.cxx\r
+SOURCE=.\src\ATCDCL\transmissionlist.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_ATC"\r
+# PROP Intermediate_Dir "Release\Lib_ATCDCL"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+# PROP Intermediate_Dir "Debug\Lib_ATCDCL"\r
 \r
 !ENDIF \r
 \r
@@ -1486,36 +1580,62 @@ SOURCE=.\src\Environment\fgclouds.hxx
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Balloon"\r
+# Begin Source File\r
 \r
-# PROP Default_Filter ""\r
+SOURCE=.\src\Environment\atmosphere.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Environment\atmosphere.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\Balloon\BalloonSim.cpp\r
+SOURCE=.\src\Environment\precipitation_mgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Balloon"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Balloon"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\Balloon\BalloonSim.h\r
+SOURCE=.\src\Environment\precipitation_mgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Balloon"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Balloon"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
@@ -1918,6 +2038,21 @@ SOURCE=.\src\FDM\JSBSim\math\FGTable.cpp
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\math\FGCondition.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Math"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Math"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Models"\r
@@ -2030,7 +2165,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGInertial.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGLGear.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGBuoyantForces.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2045,7 +2180,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGLGear.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGMassBalance.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGExternalForce.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2060,7 +2195,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGMassBalance.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGModel.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGLGear.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2075,7 +2210,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGModel.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGOutput.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGMassBalance.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2090,7 +2225,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGOutput.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGPropagate.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGModel.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2105,7 +2240,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGPropagate.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGPropulsion.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGOutput.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2120,7 +2255,7 @@ SOURCE=.\src\FDM\JSBSim\models\FGPropulsion.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\FGInput.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGPropagate.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2133,73 +2268,73 @@ SOURCE=.\src\FDM\JSBSim\models\FGInput.cpp
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_FlightControl"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGCondition.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGPropulsion.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Release\Lib_Models"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Debug\Lib_Models"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGDeadBand.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGInput.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Release\Lib_Models"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Debug\Lib_Models"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGFCSComponent.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGExternalReactions.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Release\Lib_Models"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Debug\Lib_Models"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGFilter.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\FGGasCell.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Release\Lib_Models"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+# PROP Intermediate_Dir "Debug\Lib_Models"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_FlightControl"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGain.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGPID.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2214,7 +2349,7 @@ SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGain.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGradient.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGDeadBand.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2229,7 +2364,7 @@ SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGradient.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGKinemat.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGFCSComponent.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2244,7 +2379,7 @@ SOURCE=.\src\FDM\JSBSim\models\flight_control\FGKinemat.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSummer.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGFilter.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2259,7 +2394,67 @@ SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSummer.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSwitch.cpp\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGain.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGGradient.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGKinemat.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSummer.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSwitch.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2301,6 +2496,21 @@ SOURCE=.\src\FDM\JSBSim\models\flight_control\FGSensor.cpp
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\models\flight_control\FGActuator.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_FlightControl"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_FlightControl"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Atmosphere"\r
@@ -3412,6 +3622,96 @@ SOURCE=.\src\FDM\SP\ACMS.hxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\Balloon.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\Balloon.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\BalloonSim.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\BalloonSim.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\MagicCarpet.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\SP\MagicCarpet.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_SPFDM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_SPFDM"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_UIUCModel"\r
@@ -6033,6 +6333,36 @@ SOURCE=.\src\FDM\YASim\Ground.hpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\YASim\Hitch.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\Hitch.hpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\YASim\Hook.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -6607,36 +6937,6 @@ SOURCE=.\src\FDM\YASim\Turbulence.hpp
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\Balloon.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\FDM\Balloon.h\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\flight.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -6697,36 +6997,6 @@ SOURCE=.\src\FDM\groundcache.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\MagicCarpet.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\FDM\MagicCarpet.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\UFO.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -6926,7 +7196,7 @@ SOURCE=.\src\GUI\gui_funcs.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\gui_local.cxx\r
+SOURCE=.\src\GUI\fonts.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6941,7 +7211,7 @@ SOURCE=.\src\GUI\gui_local.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\gui_local.hxx\r
+SOURCE=.\src\GUI\AirportList.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6956,7 +7226,7 @@ SOURCE=.\src\GUI\gui_local.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\fonts.cxx\r
+SOURCE=.\src\GUI\AirportList.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6971,7 +7241,7 @@ SOURCE=.\src\GUI\fonts.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\sgVec3Slider.cxx\r
+SOURCE=.\src\GUI\property_list.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6986,7 +7256,7 @@ SOURCE=.\src\GUI\sgVec3Slider.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\sgVec3Slider.hxx\r
+SOURCE=.\src\GUI\property_list.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7001,7 +7271,7 @@ SOURCE=.\src\GUI\sgVec3Slider.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\trackball.c\r
+SOURCE=.\src\GUI\layout.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7016,7 +7286,7 @@ SOURCE=.\src\GUI\trackball.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\trackball.h\r
+SOURCE=.\src\GUI\layout-props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7031,7 +7301,7 @@ SOURCE=.\src\GUI\trackball.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\puList.cxx\r
+SOURCE=.\src\GUI\layout.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7046,7 +7316,7 @@ SOURCE=.\src\GUI\puList.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\puList.hxx\r
+SOURCE=.\src\GUI\SafeTexFont.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7061,7 +7331,7 @@ SOURCE=.\src\GUI\puList.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\AirportList.cxx\r
+SOURCE=.\src\GUI\SafeTexFont.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7074,137 +7344,77 @@ SOURCE=.\src\GUI\AirportList.cxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Input"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\AirportList.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\GUI\property_list.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\GUI\property_list.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\GUI\layout.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\GUI\layout-props.cxx\r
+SOURCE=.\src\Input\input.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\layout.hxx\r
+SOURCE=.\src\Input\input.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # End Group\r
-# Begin Group "Lib_Input"\r
+# Begin Group "Lib_Instrumentation"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Input\input.cxx\r
+SOURCE=.\src\Instrumentation\instrument_mgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Input"\r
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Input"\r
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Input\input.hxx\r
+SOURCE=.\src\Instrumentation\instrument_mgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Input"\r
+# PROP Intermediate_Dir "Release\Lib_Instrumentation"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Input"\r
+# PROP Intermediate_Dir "Debug\Lib_Instrumentation"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Instrumentation"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\instrument_mgr.cxx\r
+SOURCE=.\src\Instrumentation\adf.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7219,7 +7429,7 @@ SOURCE=.\src\Instrumentation\instrument_mgr.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\instrument_mgr.hxx\r
+SOURCE=.\src\Instrumentation\adf.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7234,7 +7444,7 @@ SOURCE=.\src\Instrumentation\instrument_mgr.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\adf.cxx\r
+SOURCE=.\src\Instrumentation\airspeed_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7249,7 +7459,7 @@ SOURCE=.\src\Instrumentation\adf.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\adf.hxx\r
+SOURCE=.\src\Instrumentation\airspeed_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7264,7 +7474,7 @@ SOURCE=.\src\Instrumentation\adf.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\airspeed_indicator.cxx\r
+SOURCE=.\src\Instrumentation\altimeter.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7279,7 +7489,7 @@ SOURCE=.\src\Instrumentation\airspeed_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\airspeed_indicator.hxx\r
+SOURCE=.\src\Instrumentation\altimeter.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7294,7 +7504,7 @@ SOURCE=.\src\Instrumentation\airspeed_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\altimeter.cxx\r
+SOURCE=.\src\Instrumentation\attitude_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7309,7 +7519,7 @@ SOURCE=.\src\Instrumentation\altimeter.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\altimeter.hxx\r
+SOURCE=.\src\Instrumentation\attitude_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7324,7 +7534,7 @@ SOURCE=.\src\Instrumentation\altimeter.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\annunciator.cxx\r
+SOURCE=.\src\Instrumentation\clock.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7339,7 +7549,7 @@ SOURCE=.\src\Instrumentation\annunciator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\annunciator.hxx\r
+SOURCE=.\src\Instrumentation\clock.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7354,7 +7564,7 @@ SOURCE=.\src\Instrumentation\annunciator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\attitude_indicator.cxx\r
+SOURCE=.\src\Instrumentation\dme.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7369,7 +7579,7 @@ SOURCE=.\src\Instrumentation\attitude_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\attitude_indicator.hxx\r
+SOURCE=.\src\Instrumentation\dme.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7384,7 +7594,7 @@ SOURCE=.\src\Instrumentation\attitude_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\clock.cxx\r
+SOURCE=.\src\Instrumentation\gps.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7399,7 +7609,7 @@ SOURCE=.\src\Instrumentation\clock.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\clock.hxx\r
+SOURCE=.\src\Instrumentation\gps.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7414,7 +7624,7 @@ SOURCE=.\src\Instrumentation\clock.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\dme.cxx\r
+SOURCE=.\src\Instrumentation\gsdi.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7429,7 +7639,7 @@ SOURCE=.\src\Instrumentation\dme.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\dme.hxx\r
+SOURCE=.\src\Instrumentation\gsdi.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7444,7 +7654,7 @@ SOURCE=.\src\Instrumentation\dme.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\encoder.cxx\r
+SOURCE=.\src\Instrumentation\gyro.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7459,7 +7669,7 @@ SOURCE=.\src\Instrumentation\encoder.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\encoder.hxx\r
+SOURCE=.\src\Instrumentation\gyro.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7474,7 +7684,7 @@ SOURCE=.\src\Instrumentation\encoder.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gps.cxx\r
+SOURCE=.\src\Instrumentation\heading_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7489,7 +7699,7 @@ SOURCE=.\src\Instrumentation\gps.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gps.hxx\r
+SOURCE=.\src\Instrumentation\heading_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7504,7 +7714,7 @@ SOURCE=.\src\Instrumentation\gps.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gsdi.cxx\r
+SOURCE=.\src\Instrumentation\heading_indicator_fg.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7519,7 +7729,7 @@ SOURCE=.\src\Instrumentation\gsdi.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gsdi.hxx\r
+SOURCE=.\src\Instrumentation\heading_indicator_fg.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7534,7 +7744,7 @@ SOURCE=.\src\Instrumentation\gsdi.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gyro.cxx\r
+SOURCE=.\src\Instrumentation\heading_indicator_dg.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7549,7 +7759,7 @@ SOURCE=.\src\Instrumentation\gyro.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\gyro.hxx\r
+SOURCE=.\src\Instrumentation\heading_indicator_dg.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7564,7 +7774,7 @@ SOURCE=.\src\Instrumentation\gyro.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator.cxx\r
+SOURCE=.\src\Instrumentation\kr_87.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7579,7 +7789,7 @@ SOURCE=.\src\Instrumentation\heading_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator.hxx\r
+SOURCE=.\src\Instrumentation\kr_87.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7594,7 +7804,7 @@ SOURCE=.\src\Instrumentation\heading_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator_fg.cxx\r
+SOURCE=.\src\Instrumentation\kt_70.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7609,7 +7819,7 @@ SOURCE=.\src\Instrumentation\heading_indicator_fg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator_fg.hxx\r
+SOURCE=.\src\Instrumentation\kt_70.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7624,7 +7834,7 @@ SOURCE=.\src\Instrumentation\heading_indicator_fg.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator_dg.cxx\r
+SOURCE=.\src\Instrumentation\mag_compass.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7639,7 +7849,7 @@ SOURCE=.\src\Instrumentation\heading_indicator_dg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\heading_indicator_dg.hxx\r
+SOURCE=.\src\Instrumentation\mag_compass.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7654,7 +7864,7 @@ SOURCE=.\src\Instrumentation\heading_indicator_dg.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\kr_87.hxx\r
+SOURCE=.\src\Instrumentation\marker_beacon.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7669,7 +7879,7 @@ SOURCE=.\src\Instrumentation\kr_87.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\kr_87.cxx\r
+SOURCE=.\src\Instrumentation\marker_beacon.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7684,7 +7894,7 @@ SOURCE=.\src\Instrumentation\kr_87.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\kt_70.cxx\r
+SOURCE=.\src\Instrumentation\mrg.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7699,7 +7909,7 @@ SOURCE=.\src\Instrumentation\kt_70.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\kt_70.hxx\r
+SOURCE=.\src\Instrumentation\mrg.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7714,7 +7924,7 @@ SOURCE=.\src\Instrumentation\kt_70.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mag_compass.cxx\r
+SOURCE=.\src\Instrumentation\navradio.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7729,7 +7939,7 @@ SOURCE=.\src\Instrumentation\mag_compass.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mag_compass.hxx\r
+SOURCE=.\src\Instrumentation\navradio.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7744,7 +7954,7 @@ SOURCE=.\src\Instrumentation\mag_compass.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\marker_beacon.cxx\r
+SOURCE=.\src\Instrumentation\slip_skid_ball.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7759,7 +7969,7 @@ SOURCE=.\src\Instrumentation\marker_beacon.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\marker_beacon.hxx\r
+SOURCE=.\src\Instrumentation\slip_skid_ball.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7774,7 +7984,7 @@ SOURCE=.\src\Instrumentation\marker_beacon.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mrg.cxx\r
+SOURCE=.\src\Instrumentation\transponder.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7789,7 +7999,7 @@ SOURCE=.\src\Instrumentation\mrg.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mrg.hxx\r
+SOURCE=.\src\Instrumentation\transponder.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7804,7 +8014,7 @@ SOURCE=.\src\Instrumentation\mrg.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\navradio.cxx\r
+SOURCE=.\src\Instrumentation\turn_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7819,7 +8029,7 @@ SOURCE=.\src\Instrumentation\navradio.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\navradio.hxx\r
+SOURCE=.\src\Instrumentation\turn_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7834,7 +8044,7 @@ SOURCE=.\src\Instrumentation\navradio.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\slip_skid_ball.cxx\r
+SOURCE=.\src\Instrumentation\vertical_speed_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7849,7 +8059,7 @@ SOURCE=.\src\Instrumentation\slip_skid_ball.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\slip_skid_ball.hxx\r
+SOURCE=.\src\Instrumentation\vertical_speed_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7864,7 +8074,7 @@ SOURCE=.\src\Instrumentation\slip_skid_ball.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\transponder.cxx\r
+SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7879,7 +8089,7 @@ SOURCE=.\src\Instrumentation\transponder.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\transponder.hxx\r
+SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7894,7 +8104,7 @@ SOURCE=.\src\Instrumentation\transponder.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\turn_indicator.cxx\r
+SOURCE=.\src\Instrumentation\od_gauge.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7909,7 +8119,7 @@ SOURCE=.\src\Instrumentation\turn_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\turn_indicator.hxx\r
+SOURCE=.\src\Instrumentation\od_gauge.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7924,7 +8134,7 @@ SOURCE=.\src\Instrumentation\turn_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\vertical_speed_indicator.cxx\r
+SOURCE=.\src\Instrumentation\wxradar.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7939,7 +8149,7 @@ SOURCE=.\src\Instrumentation\vertical_speed_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\vertical_speed_indicator.hxx\r
+SOURCE=.\src\Instrumentation\wxradar.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7954,7 +8164,7 @@ SOURCE=.\src\Instrumentation\vertical_speed_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.cxx\r
+SOURCE=.\src\Instrumentation\tacan.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7969,7 +8179,7 @@ SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.hxx\r
+SOURCE=.\src\Instrumentation\tacan.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7984,7 +8194,7 @@ SOURCE=.\src\Instrumentation\inst_vertical_speed_indicator.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\od_gauge.hxx\r
+SOURCE=.\src\Instrumentation\mk_viii.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7999,7 +8209,7 @@ SOURCE=.\src\Instrumentation\od_gauge.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\od_gauge.cxx\r
+SOURCE=.\src\Instrumentation\mk_viii.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8014,7 +8224,7 @@ SOURCE=.\src\Instrumentation\od_gauge.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\wxradar.hxx\r
+SOURCE=.\src\Instrumentation\dclgps.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8029,7 +8239,7 @@ SOURCE=.\src\Instrumentation\wxradar.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\wxradar.cxx\r
+SOURCE=.\src\Instrumentation\dclgps.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8044,7 +8254,7 @@ SOURCE=.\src\Instrumentation\wxradar.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\tacan.cxx\r
+SOURCE=.\src\Instrumentation\render_area_2d.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8059,7 +8269,7 @@ SOURCE=.\src\Instrumentation\tacan.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\tacan.hxx\r
+SOURCE=.\src\Instrumentation\render_area_2d.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8074,7 +8284,7 @@ SOURCE=.\src\Instrumentation\tacan.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mk_viii.cxx\r
+SOURCE=.\src\Instrumentation\groundradar.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8089,7 +8299,7 @@ SOURCE=.\src\Instrumentation\mk_viii.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\mk_viii.hxx\r
+SOURCE=.\src\Instrumentation\groundradar.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8104,7 +8314,7 @@ SOURCE=.\src\Instrumentation\mk_viii.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\dclgps.cxx\r
+SOURCE=.\src\Instrumentation\agradar.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8119,7 +8329,7 @@ SOURCE=.\src\Instrumentation\dclgps.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\dclgps.hxx\r
+SOURCE=.\src\Instrumentation\agradar.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8134,7 +8344,7 @@ SOURCE=.\src\Instrumentation\dclgps.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\render_area_2d.cxx\r
+SOURCE=.\src\Instrumentation\rad_alt.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8149,7 +8359,7 @@ SOURCE=.\src\Instrumentation\render_area_2d.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Instrumentation\render_area_2d.hxx\r
+SOURCE=.\src\Instrumentation\rad_alt.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8806,41 +9016,191 @@ SOURCE=.\src\Instrumentation\HUD\HUD_tbi.cxx
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_HUD"\r
+# PROP Intermediate_Dir "Release\Lib_HUD"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_HUD"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "main"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\bootstrap.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_Main"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\main.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\main.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\renderer.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\renderer.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_commands.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_commands.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_init.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_init.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_io.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_HUD"\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "main"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\bootstrap.cxx\r
+SOURCE=.\src\Main\fg_io.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Main"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\main.cxx\r
+SOURCE=.\src\Main\fg_props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8855,7 +9215,7 @@ SOURCE=.\src\Main\main.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\main.hxx\r
+SOURCE=.\src\Main\fg_props.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8870,7 +9230,7 @@ SOURCE=.\src\Main\main.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\renderer.cxx\r
+SOURCE=.\src\Main\globals.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8885,7 +9245,7 @@ SOURCE=.\src\Main\renderer.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\renderer.hxx\r
+SOURCE=.\src\Main\globals.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8900,7 +9260,7 @@ SOURCE=.\src\Main\renderer.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_commands.cxx\r
+SOURCE=.\src\Main\logger.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8915,7 +9275,7 @@ SOURCE=.\src\Main\fg_commands.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_commands.hxx\r
+SOURCE=.\src\Main\logger.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8930,7 +9290,7 @@ SOURCE=.\src\Main\fg_commands.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_init.cxx\r
+SOURCE=.\src\Main\options.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8945,7 +9305,7 @@ SOURCE=.\src\Main\fg_init.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_init.hxx\r
+SOURCE=.\src\Main\options.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8960,7 +9320,7 @@ SOURCE=.\src\Main\fg_init.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_io.cxx\r
+SOURCE=.\src\Main\splash.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8975,7 +9335,7 @@ SOURCE=.\src\Main\fg_io.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_io.hxx\r
+SOURCE=.\src\Main\splash.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8990,7 +9350,7 @@ SOURCE=.\src\Main\fg_io.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_props.cxx\r
+SOURCE=.\src\Main\util.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9005,7 +9365,7 @@ SOURCE=.\src\Main\fg_props.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_props.hxx\r
+SOURCE=.\src\Main\util.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9020,7 +9380,7 @@ SOURCE=.\src\Main\fg_props.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\globals.cxx\r
+SOURCE=.\src\Main\viewer.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9035,7 +9395,7 @@ SOURCE=.\src\Main\globals.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\globals.hxx\r
+SOURCE=.\src\Main\viewer.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9050,7 +9410,7 @@ SOURCE=.\src\Main\globals.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\logger.cxx\r
+SOURCE=.\src\Main\viewmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9065,7 +9425,7 @@ SOURCE=.\src\Main\logger.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\logger.hxx\r
+SOURCE=.\src\Main\viewmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9080,7 +9440,7 @@ SOURCE=.\src\Main\logger.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\options.cxx\r
+SOURCE=.\src\Main\CameraGroup.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9095,7 +9455,7 @@ SOURCE=.\src\Main\options.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\options.hxx\r
+SOURCE=.\src\Main\CameraGroup.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9110,7 +9470,7 @@ SOURCE=.\src\Main\options.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\splash.cxx\r
+SOURCE=.\src\Main\FGManipulator.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9125,7 +9485,7 @@ SOURCE=.\src\Main\splash.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\splash.hxx\r
+SOURCE=.\src\Main\FGManipulator.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9140,7 +9500,7 @@ SOURCE=.\src\Main\splash.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\util.cxx\r
+SOURCE=.\src\Main\ViewPartitionNode.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9155,7 +9515,7 @@ SOURCE=.\src\Main\util.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\util.hxx\r
+SOURCE=.\src\Main\ViewPartitionNode.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9170,7 +9530,7 @@ SOURCE=.\src\Main\util.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer.cxx\r
+SOURCE=.\src\Main\WindowSystemAdapter.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9185,7 +9545,7 @@ SOURCE=.\src\Main\viewer.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer.hxx\r
+SOURCE=.\src\Main\WindowSystemAdapter.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9200,7 +9560,7 @@ SOURCE=.\src\Main\viewer.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewmgr.cxx\r
+SOURCE=.\src\Main\WindowBuilder.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9215,7 +9575,7 @@ SOURCE=.\src\Main\viewmgr.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewmgr.hxx\r
+SOURCE=.\src\Main\WindowBuilder.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9230,7 +9590,7 @@ SOURCE=.\src\Main\viewmgr.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_os.cxx\r
+SOURCE=.\src\Main\fg_os_osgviewer.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9245,7 +9605,7 @@ SOURCE=.\src\Main\fg_os.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_os.hxx\r
+SOURCE=.\src\Main\$(GFX_COMMON)\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9478,6 +9838,36 @@ SOURCE=.\src\AIModel\AIBase.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\AIModel\AIModelData.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\AIModelData.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\AIModel\AIAircraft.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -9703,6 +10093,21 @@ SOURCE=.\src\AIModel\AIFlightPlanCreate.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\AIModel\AIFlightPlanCreatePushBack.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\AIModel\AIFlightPlanCreateCruise.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -9775,6 +10180,126 @@ SOURCE=.\src\AIModel\AIStatic.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\AITanker.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\AITanker.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\AIWingman.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\AIWingman.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\performancedata.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\performancedata.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\performancedb.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\AIModel\performancedb.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_MultiPlayer"\r
@@ -9981,6 +10506,21 @@ SOURCE=.\src\Navaids\navrecord.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Navaids\navrecord.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Navaids"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Navaids"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\Navaids\navlist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -10799,37 +11339,7 @@ SOURCE=.\src\Network\generic.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Scenery\FGTileLoader.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Scenery"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Scenery"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\Scenery\FGTileLoader.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Scenery"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Scenery"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\Scenery\newcache.cxx\r
+SOURCE=.\src\Scenery\redout.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -10844,7 +11354,7 @@ SOURCE=.\src\Scenery\newcache.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Scenery\newcache.hxx\r
+SOURCE=.\src\Scenery\redout.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -10889,7 +11399,7 @@ SOURCE=.\src\Scenery\scenery.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Scenery\tileentry.cxx\r
+SOURCE=.\src\Scenery\SceneryPager.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -10904,7 +11414,7 @@ SOURCE=.\src\Scenery\tileentry.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Scenery\tileentry.hxx\r
+SOURCE=.\src\Scenery\SceneryPager.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r

diff --git a/Makefile.am b/Makefile.am
index 2b4f55edeff1bd8077648e10d013377a4326a8b7..26d0a923df278e05c431ac564b800419f9619b27 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = \
        Thanks
 
 dist-hook:
-       (cd $(top_srcdir); $(HOME)/src/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 -)
        rm -rf `find $(distdir)/projects -name CVS`
@@ -38,7 +38,7 @@ dist-hook:
 # note, fedora core tar does case insensitive wildcard matching for
 # directories, but apparently not files ... some stupid reason. :-(
 
-fgfs-base-tar:
+data-tar:
        (cd ..; \
        tar \
        --exclude=CVS \
@@ -55,7 +55,7 @@ fgfs-base-tar:
        --exclude='*/Docs/source' \
         --exclude='*/Models/MNUAV' \
         --exclude='*/Models/Airspace' \
-       -cjvf fgfs-base-$(VERSION).tar.bz2 \
+       -cjvf source/FlightGear-data-$(VERSION).tar.bz2 \
                data/AI \
                 data/Aircraft/Generic \
                 data/Aircraft/Instruments \

diff --git a/configure.ac b/configure.ac
index dde173e0818935b3c634ed037be1c4c53f462afb..59fa9a6594ce12160610fc7152d967eca995d5fb 100644 (file)
--- 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, 1.0.0)
+AM_INIT_AUTOMAKE(FlightGear, 1.99.4)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET