From: curt <curt>
Date: Sun, 21 Apr 2002 05:51:37 +0000 (+0000)
Subject: Fix a couple "make dist" problems that crept in since the last release.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cf146a7d1b995cc28eb5f3f71b0bd10cdeab3ef5;p=flightgear.git

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 7838d67a1..5de11a36a 100644
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -167,7 +167,22 @@ SOURCE=.\src\Airports\simple.hxx
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\ATC\atis.cxx
+SOURCE=.\src\ATC\ATC.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\ATC.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -197,6 +212,21 @@ SOURCE=.\src\ATC\atis.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\ATC\atis.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\ATC\atislist.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -227,6 +257,126 @@ SOURCE=.\src\ATC\atislist.cxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\ATC\tower.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\tower.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\towerlist.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\towerlist.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\approach.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\approach.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\approachlist.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\approachlist.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\ATC\ATCdisplay.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -254,6 +404,156 @@ SOURCE=.\src\ATC\ATCdisplay.cxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\ATCmgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\ATCmgr.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\ATCutils.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\ATCutils.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AIMgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AIMgr.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AIEntity.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AIEntity.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AILocalTraffic.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\ATC\AILocalTraffic.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_ATC"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_ATC"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Autopilot"
@@ -667,6 +967,40 @@ SOURCE=.\src\Cockpit\steam.hxx
 
 !ENDIF 
 
+# End Source File
+# End Group
+# Begin Group "Lib_Built_in"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\Cockpit\built_in\FGMagRibbon.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Built_in"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Built_in"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Cockpit\built_in\FGMagRibbon.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Built_in"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Built_in"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Controls"
@@ -701,6 +1035,70 @@ SOURCE=.\src\Controls\controls.hxx
 
 !ENDIF 
 
+# End Source File
+# End Group
+# Begin Group "Lib_Environment"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\Environment\environment.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Environment\environment.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Environment\environment_mgr.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Environment\environment_mgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Environment"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Environment"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_Balloon"
@@ -2014,6 +2412,51 @@ SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\JSBSim\FGPropertyManager.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\JSBSim\JSBSim.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\JSBSim\JSBSim.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_JSBSim"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_JSBSim"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_filtersjb"
@@ -2899,7 +3342,37 @@ SOURCE=.\src\FDM\LaRCsim\ls_interface.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.cpp
+SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2914,7 +3387,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.h
+SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2929,7 +3402,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1DdataFileReader.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.cpp
+SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2944,7 +3417,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h
+SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2959,7 +3432,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_1Dinterpolation.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp
+SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2974,7 +3447,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h
+SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -2989,7 +3462,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2DdataFileReader.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -3004,7 +3477,7 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\UIUCModel\uiuc_2Dinterpolation.h
+SOURCE=.\src\FDM\UIUCModel\uiuc_3Dinterpolation.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -5097,36 +5570,6 @@ SOURCE=.\src\FDM\IO360.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\JSBSim.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\JSBSim.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\LaRCsim.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -5679,6 +6122,36 @@ SOURCE=.\src\Main\globals.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\Main\logger.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\main"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\main"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Main\logger.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\main"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\main"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Main\options.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -5769,7 +6242,7 @@ SOURCE=.\src\Main\viewer.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\viewer_lookat.cxx
+SOURCE=.\src\Main\viewmgr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -5784,7 +6257,7 @@ SOURCE=.\src\Main\viewer_lookat.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\viewer_lookat.hxx
+SOURCE=.\src\Main\viewmgr.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -5799,7 +6272,7 @@ SOURCE=.\src\Main\viewer_lookat.hxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\viewer_rph.cxx
+SOURCE=.\src\Main\location.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -5814,7 +6287,7 @@ SOURCE=.\src\Main\viewer_rph.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\viewer_rph.hxx
+SOURCE=.\src\Main\location.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -5827,32 +6300,96 @@ SOURCE=.\src\Main\viewer_rph.hxx
 !ENDIF 
 
 # End Source File
+# End Group
+# Begin Group "Lib_Model"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\Main\viewmgr.cxx
+SOURCE=.\src\Model\model.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\main"
+# PROP Intermediate_Dir "Release\Lib_Model"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\main"
+# PROP Intermediate_Dir "Debug\Lib_Model"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\viewmgr.hxx
+SOURCE=.\src\Model\model.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\main"
+# PROP Intermediate_Dir "Release\Lib_Model"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\main"
+# PROP Intermediate_Dir "Debug\Lib_Model"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Model\modelmgr.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Model"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Model"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Model\modelmgr.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Model"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Model"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Model\acmodel.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Model"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Model"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Model\acmodel.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Model"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Model"
 
 !ENDIF 
 
@@ -6561,6 +7098,36 @@ SOURCE=.\src\Objects\apt_signs.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\Objects\dir_lights.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Objects"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Objects"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Objects\dir_lights.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Objects"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Objects"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Objects\newmat.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -6914,6 +7481,36 @@ SOURCE=.\src\Sound\beacon.hxx
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\Sound\fg_sound.cxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Sound"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Sound"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\Sound\fg_sound.hxx
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_Sound"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_Sound"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\Sound\fg_fx.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -7008,7 +7605,7 @@ SOURCE=.\src\Sound\soundmgr.hxx
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\Time\event.cxx
+SOURCE=.\src\Time\FGEventMgr.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -7023,7 +7620,7 @@ SOURCE=.\src\Time\event.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Time\event.hxx
+SOURCE=.\src\Time\FGEventMgr.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -7327,6 +7924,21 @@ SOURCE=.\src\WeatherCM\FGPhysicalProperties.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\WeatherCM\FGPhysicalProperties_bind.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\WeatherCM\FGPhysicalProperty.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -7609,6 +8221,66 @@ SOURCE=.\src\WeatherCM\FGWindItem.h
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\WeatherCM\linintp2.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\WeatherCM\linintp2.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\WeatherCM\sphrintp.cpp
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\WeatherCM\sphrintp.h
+
+!IF  "$(CFG)" == "FlightGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_WeatherCM"
+
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_WeatherCM"
+
+!ENDIF 
+
 # End Source File
 # End Group
 
diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am
index ba67f4702..9f6789cdc 100644
--- 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 b3fcbe815..a9fec7a61 100644
--- 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 2ac495940..7833f6a68 100644
--- 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