Fix a couple "make dist" problems that crept in since the last release.

Regengerate msvc project files.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 7838d67a10f9d319436964f41566bdebad5e1a71..5de11a36a224c5df1a126218c2f07dfcabc3e392 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -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
@@ -667,6 +967,40 @@ SOURCE=.\src\Cockpit\steam.hxx
 \r
 !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\built_in\FGMagRibbon.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Built_in"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\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\built_in\FGMagRibbon.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Built_in"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\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
@@ -701,6 +1035,70 @@ SOURCE=.\src\Controls\controls.hxx
 \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\Environment\environment.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Environment\environment.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Environment\environment_mgr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Environment\environment_mgr.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Environment"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Environment"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Balloon"\r
@@ -2014,6 +2412,51 @@ SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h
 \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
@@ -2899,7 +3342,37 @@ SOURCE=.\src\FDM\LaRCsim\ls_interface.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.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_1DdataFileReader.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_1Dinterpolation.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2914,7 +3387,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2929,7 +3402,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2944,7 +3417,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2959,7 +3432,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2974,7 +3447,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2989,7 +3462,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -3004,7 +3477,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.h\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5097,36 +5570,6 @@ SOURCE=.\src\FDM\IO360.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\FDM\JSBSim.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Flight"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Flight"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\LaRCsim.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -5679,6 +6122,36 @@ SOURCE=.\src\Main\globals.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Main\logger.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\logger.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\Main\options.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -5769,7 +6242,7 @@ SOURCE=.\src\Main\viewer.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_lookat.cxx\r
+SOURCE=.\src\Main\viewmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5784,7 +6257,7 @@ SOURCE=.\src\Main\viewer_lookat.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_lookat.hxx\r
+SOURCE=.\src\Main\viewmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5799,7 +6272,7 @@ SOURCE=.\src\Main\viewer_lookat.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_rph.cxx\r
+SOURCE=.\src\Main\location.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5814,7 +6287,7 @@ SOURCE=.\src\Main\viewer_rph.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\viewer_rph.hxx\r
+SOURCE=.\src\Main\location.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5827,32 +6300,96 @@ SOURCE=.\src\Main\viewer_rph.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\viewmgr.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\viewmgr.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\Model\modelmgr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Model\modelmgr.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Model\acmodel.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Model\acmodel.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Model"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Model"\r
 \r
 !ENDIF \r
 \r
@@ -6561,6 +7098,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 +7481,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 +7605,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 +7620,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 +7924,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
@@ -7609,6 +8221,66 @@ SOURCE=.\src\WeatherCM\FGWindItem.h
 \r
 !ENDIF \r
 \r
+# End Source File\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
 \r

diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am
index ba67f4702360e9e807adb8f14055b355b91ca4c0..9f6789cdc04f74ca284d184a8486606a5197c05f 100644 (file)
--- a/src/Cockpit/Makefile.am
+++ b/src/Cockpit/Makefile.am
@@ -10,8 +10,7 @@ libCockpit_a_SOURCES = \
        panel.cxx panel.hxx \
         panel_io.cxx panel_io.hxx \
        radiostack.cxx radiostack.hxx \
-       steam.cxx steam.hxx \
-       libBuilt_in.a
+       steam.cxx steam.hxx
 
 if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Objects/dir_lights.hxx b/src/Objects/dir_lights.hxx
index b3fcbe81566c6857c88f0a3a41e4881438f211d9..a9fec7a61e33d77efb6acb8bfcf407f702f34a1f 100644 (file)
--- a/src/Objects/dir_lights.hxx
+++ b/src/Objects/dir_lights.hxx
@@ -36,11 +36,18 @@
 
 #include <simgear/compiler.h>
 
+#include <vector>              // STL
 #include STL_STRING
 
 #include <plib/ssg.h>          // plib include
 
 SG_USING_STD(string);
+SG_USING_STD(vector);
+
+
+typedef vector < int > int_list;
+typedef int_list::iterator int_list_iterator;
+typedef int_list::const_iterator int_point_list_iterator;
 
 
 // Define the various supported light types
@@ -89,4 +96,10 @@ enum {
 ssgLeaf *gen_directional_light( sgVec3 pt, sgVec3 dir );
 
 
+/* ssgLeaf *gen_directional_lights( const point_list &nodes,
+                                const point_list &normals,
+                                const int_list &pnt_i,
+                                const int_list &nml_i );
+*/
+
 #endif // _DIR_LIGHTS_HXX

diff --git a/src/WeatherCM/Makefile.am b/src/WeatherCM/Makefile.am
index 2ac495940987975b696ddb240b9c598d50b5248d..7833f6a68276abe952b112e1f96fbc7e2b153fcc 100644 (file)
--- a/src/WeatherCM/Makefile.am
+++ b/src/WeatherCM/Makefile.am
@@ -1,7 +1,5 @@
 noinst_LIBRARIES = libWeatherCM.a
 
-EXTRA_DIST = linintp2.inl sphrintp.inl
-
 libWeatherCM_a_SOURCES = \
        FGAirPressureItem.cpp FGAirPressureItem.h \
        FGCloud.h FGCloudItem.cpp FGCloudItem.h \
@@ -19,7 +17,7 @@ libWeatherCM_a_SOURCES = \
        FGWeatherVectorWrap.h \
        FGWindItem.cpp FGWindItem.h \
         linintp2.cpp linintp2.h \
-        sphrintp.cpp sphrint.h
+        sphrintp.cpp sphrintp.h
 
 if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src