Changes towards ground control and AI taxiing currently very hardwired to KEMT

[flightgear.git] / FlightGear.dsp

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 7838d67a10f9d319436964f41566bdebad5e1a71..4e9cfd223d8e0506cd67fe92a73ed0ea7f6e81d7 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -35,13 +35,13 @@ RSC=rc.exe
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
-# ADD CPP /nologo /W3 /GX /O2 /D "HAVE_CONFIG_H"  /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\simgear\metakit\include" /D "FGFS" /D "HAVE_CONFIG_H" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c  /MTd /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H" /D "FGFS" /D "FG_NEW_ENVIRONMENT" /D "ENABLE_AUDIO_SUPPORT" /D "ENABLE_PLIB_JOYSTICK"\r
 # SUBTRACT CPP /YX\r
 # ADD RSC /l 0xc09 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386  /libpath:"..\plib" ssg.lib sg.lib pui.lib fnt.lib sl.lib ul.lib ssgaux.lib net.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 \r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
@@ -51,12 +51,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c /D "HAVE_CONFIG_H"  /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\simgear\metakit\include" /D "FGFS" /D "HAVE_CONFIG_H"\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c  /MTd /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H" /D "FGFS" /D "FG_NEW_ENVIRONMENT" /D "ENABLE_AUDIO_SUPPORT" /D "ENABLE_PLIB_JOYSTICK"\r
 # ADD RSC /l 0xc09 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept  /libpath:"..\plib" ssg.lib sg.lib pui.lib fnt.lib sl.lib ul.lib ssgaux.lib net.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib"\r
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept \r
 \r
 !ENDIF \r
 \r
@@ -167,7 +167,22 @@ SOURCE=.\src\Airports\simple.hxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\ATC\atis.cxx\r
+SOURCE=.\src\ATC\ATC.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\ATC.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -197,6 +212,21 @@ SOURCE=.\src\ATC\atis.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\ATC\atis.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\ATC\atislist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -227,6 +257,126 @@ SOURCE=.\src\ATC\atislist.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\ATC\tower.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\tower.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\towerlist.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\towerlist.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\approach.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\approach.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\approachlist.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\approachlist.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\ATC\ATCdisplay.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -254,6 +404,156 @@ SOURCE=.\src\ATC\ATCdisplay.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\ATCmgr.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\ATCmgr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\ATCutils.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\ATCutils.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AIMgr.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AIMgr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AIEntity.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AIEntity.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AILocalTraffic.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\ATC\AILocalTraffic.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_ATC"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_ATC"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Autopilot"\r
@@ -400,7 +700,187 @@ SOURCE=.\src\Cockpit\hud_opts.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_card.cxx\r
+SOURCE=.\src\Cockpit\hud_card.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_dnst.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_gaug.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_inst.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_labl.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_ladr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_lat.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_lon.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_scal.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\hud_tbi.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\kr_87.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\kr_87.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Cockpit\kt_70.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -415,7 +895,7 @@ SOURCE=.\src\Cockpit\hud_card.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_dnst.cxx\r
+SOURCE=.\src\Cockpit\kt_70.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -430,7 +910,7 @@ SOURCE=.\src\Cockpit\hud_dnst.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_gaug.cxx\r
+SOURCE=.\src\Cockpit\panel.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -445,7 +925,7 @@ SOURCE=.\src\Cockpit\hud_gaug.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_inst.cxx\r
+SOURCE=.\src\Cockpit\panel.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -460,7 +940,7 @@ SOURCE=.\src\Cockpit\hud_inst.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_labl.cxx\r
+SOURCE=.\src\Cockpit\panel_io.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -475,7 +955,7 @@ SOURCE=.\src\Cockpit\hud_labl.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_ladr.cxx\r
+SOURCE=.\src\Cockpit\panel_io.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -490,7 +970,7 @@ SOURCE=.\src\Cockpit\hud_ladr.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_lat.cxx\r
+SOURCE=.\src\Cockpit\radiostack.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -505,7 +985,7 @@ SOURCE=.\src\Cockpit\hud_lat.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_lon.cxx\r
+SOURCE=.\src\Cockpit\radiostack.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -520,7 +1000,7 @@ SOURCE=.\src\Cockpit\hud_lon.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_scal.cxx\r
+SOURCE=.\src\Cockpit\steam.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -535,7 +1015,7 @@ SOURCE=.\src\Cockpit\hud_scal.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\hud_tbi.cxx\r
+SOURCE=.\src\Cockpit\steam.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -548,156 +1028,164 @@ SOURCE=.\src\Cockpit\hud_tbi.cxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Built_in"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\panel.cxx\r
+SOURCE=.\src\Cockpit\built_in\FGMagRibbon.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Built_in"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Built_in"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\panel.hxx\r
+SOURCE=.\src\Cockpit\built_in\FGMagRibbon.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Built_in"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Built_in"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Controls"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\panel_io.cxx\r
+SOURCE=.\src\Controls\controls.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Controls"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Controls"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\panel_io.hxx\r
+SOURCE=.\src\Controls\controls.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Controls"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Controls"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Environment"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\radiostack.cxx\r
+SOURCE=.\src\Environment\environment.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\radiostack.hxx\r
+SOURCE=.\src\Environment\environment.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\steam.cxx\r
+SOURCE=.\src\Environment\environment_mgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Cockpit\steam.hxx\r
+SOURCE=.\src\Environment\environment_mgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Cockpit"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Controls"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Controls\controls.cxx\r
+SOURCE=.\src\Environment\environment_ctrl.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Controls"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Controls"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Controls\controls.hxx\r
+SOURCE=.\src\Environment\environment_ctrl.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Controls"\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Controls"\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
 \r
 !ENDIF \r
 \r
@@ -2014,6 +2502,81 @@ SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\FGPropertyManager.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\JSBSim.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\JSBSim\JSBSim.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_filtersjb"\r
@@ -3019,6 +3582,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\UIUCModel\uiuc_aerodeflections.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -3094,7 +3687,97 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_betaprobe.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_betaprobe.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_betaprobe.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3109,7 +3792,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_betaprobe.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3124,7 +3807,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3139,7 +3822,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_drag.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3154,7 +3837,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3169,7 +3852,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_lift.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3184,7 +3867,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3199,7 +3882,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_pitch.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3214,7 +3897,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3229,7 +3912,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_roll.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3244,7 +3927,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3259,7 +3942,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_sideforce.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_convert.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3274,7 +3957,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_convert.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3289,7 +3972,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coef_yaw.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_engine.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3304,7 +3987,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_engine.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3319,7 +4002,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_coefficients.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_fog.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3334,7 +4017,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_fog.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3349,7 +4032,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_controlInput.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_convert.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_gear.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3364,7 +4047,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_convert.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_convert.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_gear.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3379,7 +4062,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_convert.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_engine.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3394,7 +4077,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_engine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_engine.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3409,7 +4092,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_engine.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_fog.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iceboot.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3424,7 +4107,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_fog.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_fog.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iceboot.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3439,7 +4122,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_fog.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_gear.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice_rates.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3454,7 +4137,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_gear.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_gear.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_ice_rates.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3469,7 +4152,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_gear.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_ice.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iced_nonlin.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3484,7 +4167,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_ice.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_ice.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_iced_nonlin.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -4159,6 +4842,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_map_record5.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_record6.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_record6.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\UIUCModel\uiuc_menu.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -5097,7 +5810,7 @@ SOURCE=.\src\FDM\IO360.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim.cxx\r
+SOURCE=.\src\FDM\LaRCsim.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5112,7 +5825,7 @@ SOURCE=.\src\FDM\JSBSim.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim.hxx\r
+SOURCE=.\src\FDM\LaRCsim.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5127,7 +5840,7 @@ SOURCE=.\src\FDM\JSBSim.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\LaRCsim.cxx\r
+SOURCE=.\src\FDM\LaRCsimIC.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5142,7 +5855,7 @@ SOURCE=.\src\FDM\LaRCsim.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\LaRCsim.hxx\r
+SOURCE=.\src\FDM\LaRCsimIC.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5157,7 +5870,7 @@ SOURCE=.\src\FDM\LaRCsim.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\LaRCsimIC.cxx\r
+SOURCE=.\src\FDM\MagicCarpet.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5172,7 +5885,7 @@ SOURCE=.\src\FDM\LaRCsimIC.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\LaRCsimIC.hxx\r
+SOURCE=.\src\FDM\MagicCarpet.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5187,7 +5900,7 @@ SOURCE=.\src\FDM\LaRCsimIC.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\MagicCarpet.cxx\r
+SOURCE=.\src\FDM\UFO.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5202,7 +5915,7 @@ SOURCE=.\src\FDM\MagicCarpet.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\MagicCarpet.hxx\r
+SOURCE=.\src\FDM\UFO.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5311,6 +6024,21 @@ SOURCE=.\src\GUI\gui.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\GUI\gui_funcs.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\gui_local.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -5319,172 +6047,322 @@ SOURCE=.\src\GUI\gui_local.cxx
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\GUI\gui_local.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\mouse.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\prop_picker.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\prop_picker.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\sgVec3Slider.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\sgVec3Slider.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\trackball.c\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\trackball.h\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
+# End Group\r
+# Begin Group "Lib_Input"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Input\input.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Input\input.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\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\GUI\gui_local.hxx\r
+SOURCE=.\src\Main\main.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\mouse.cxx\r
+SOURCE=.\src\Main\fg_commands.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\prop_picker.cxx\r
+SOURCE=.\src\Main\fg_commands.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\prop_picker.hxx\r
+SOURCE=.\src\Main\fg_init.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\sgVec3Slider.cxx\r
+SOURCE=.\src\Main\fg_init.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\sgVec3Slider.hxx\r
+SOURCE=.\src\Main\fg_io.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\trackball.c\r
+SOURCE=.\src\Main\fg_io.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\trackball.h\r
+SOURCE=.\src\Main\fg_props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !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\Input\input.cxx\r
+SOURCE=.\src\Main\fg_props.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Input"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Input"\r
+# PROP Intermediate_Dir "Debug\main"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Input\input.hxx\r
+SOURCE=.\src\Main\fgfs.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Input"\r
+# PROP Intermediate_Dir "Release\main"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Input"\r
+# PROP Intermediate_Dir "Debug\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\main.cxx\r
+SOURCE=.\src\Main\fgfs.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5499,7 +6377,7 @@ SOURCE=.\src\Main\main.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fg_commands.cxx\r
+SOURCE=.\src\Main\globals.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5514,7 +6392,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\globals.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5529,7 +6407,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\logger.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5544,7 +6422,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\logger.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5559,7 +6437,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\options.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5574,7 +6452,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\options.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5589,7 +6467,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\splash.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5604,7 +6482,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\splash.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5619,7 +6497,7 @@ SOURCE=.\src\Main\fg_props.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fgfs.cxx\r
+SOURCE=.\src\Main\viewer.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5634,7 +6512,7 @@ SOURCE=.\src\Main\fgfs.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\fgfs.hxx\r
+SOURCE=.\src\Main\viewer.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5649,7 +6527,7 @@ SOURCE=.\src\Main\fgfs.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\globals.cxx\r
+SOURCE=.\src\Main\viewmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5664,7 +6542,7 @@ SOURCE=.\src\Main\globals.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\globals.hxx\r
+SOURCE=.\src\Main\viewmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5679,7 +6557,7 @@ SOURCE=.\src\Main\globals.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\options.cxx\r
+SOURCE=.\src\Main\location.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5694,7 +6572,7 @@ SOURCE=.\src\Main\options.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\options.hxx\r
+SOURCE=.\src\Main\location.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5707,152 +6585,156 @@ SOURCE=.\src\Main\options.hxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Model"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\splash.cxx\r
+SOURCE=.\src\Model\loader.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\splash.hxx\r
+SOURCE=.\src\Model\loader.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer.cxx\r
+SOURCE=.\src\Model\model.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer.hxx\r
+SOURCE=.\src\Model\model.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_lookat.cxx\r
+SOURCE=.\src\Model\modelmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_lookat.hxx\r
+SOURCE=.\src\Model\modelmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_rph.cxx\r
+SOURCE=.\src\Model\acmodel.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_rph.hxx\r
+SOURCE=.\src\Model\acmodel.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewmgr.cxx\r
+SOURCE=.\src\Model\panelnode.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewmgr.hxx\r
+SOURCE=.\src\Model\panelnode.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\main"\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\main"\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
@@ -6561,6 +7443,36 @@ SOURCE=.\src\Objects\apt_signs.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Objects\dir_lights.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Objects"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Objects"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Objects\dir_lights.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Objects"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Objects"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\Objects\newmat.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -6914,6 +7826,36 @@ SOURCE=.\src\Sound\beacon.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Sound\fg_sound.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Sound"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Sound"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Sound\fg_sound.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Sound"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Sound"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\Sound\fg_fx.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -7008,7 +7950,7 @@ SOURCE=.\src\Sound\soundmgr.hxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Time\event.cxx\r
+SOURCE=.\src\Time\FGEventMgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7023,7 +7965,7 @@ SOURCE=.\src\Time\event.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Time\event.hxx\r
+SOURCE=.\src\Time\FGEventMgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7327,6 +8269,21 @@ SOURCE=.\src\WeatherCM\FGPhysicalProperties.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\WeatherCM\FGPhysicalProperties_bind.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\WeatherCM\FGPhysicalProperty.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -7610,8 +8567,67 @@ SOURCE=.\src\WeatherCM\FGWindItem.h
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
+# Begin Source File\r
+\r
+SOURCE=.\src\WeatherCM\linintp2.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\WeatherCM\linintp2.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"\r
 \r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\WeatherCM\sphrintp.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\WeatherCM\sphrintp.h\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
 # Begin Source File\r
 \r
 SOURCE = .\src\Include\config.h-msvc6\r
@@ -7621,7 +8637,7 @@ SOURCE = .\src\Include\config.h-msvc6
 # Begin Custom Build - Creating config.h\r
 InputPath=.\src\Include\config.h-msvc6\r
 \r
-".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+".\src\Include\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
        copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
 \r
 # End Custom Build\r
@@ -7631,7 +8647,7 @@ InputPath=.\src\Include\config.h-msvc6
 # Begin Custom Build - Creating config.h\r
 InputPath=.\src\Include\config.h-msvc6\r
 \r
-".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+".\src\Include\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
        copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
 \r
 # End Custom Build\r