X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=FlightGear.dsp;h=dde9687a88047189512d456981308fa51241a4aa;hb=b8724644c66b162af1cb86f7fee46ed7c197d4bd;hp=593c9766dbc065cf410053e6f409afa779c806a6;hpb=b68b751fd46b633d6eb394b842690edc9be3c2f1;p=flightgear.git

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