Various tweaks for v0.9.5-pre1.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 74b6f8143fdc44f88396c02de4c5431be77e9810..9a0b6116af7858264e6805f033b3de9d731f5975 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -1748,36 +1748,6 @@ SOURCE=.\src\FDM\JSBSim\FGColumnVector3.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGColumnVector4.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\FGColumnVector4.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\FGConfigFile.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -1808,21 +1778,6 @@ SOURCE=.\src\FDM\JSBSim\FGConfigFile.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGDefs.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\FGFCS.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -2333,37 +2288,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropulsion.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPosition.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\FGPosition.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\FGRotation.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGRotor.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2378,7 +2303,7 @@ SOURCE=.\src\FDM\JSBSim\FGRotation.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRotation.h\r
+SOURCE=.\src\FDM\JSBSim\FGRotor.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2393,7 +2318,7 @@ SOURCE=.\src\FDM\JSBSim\FGRotation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRotor.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGRocket.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2408,7 +2333,7 @@ SOURCE=.\src\FDM\JSBSim\FGRotor.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRotor.h\r
+SOURCE=.\src\FDM\JSBSim\FGRocket.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2423,7 +2348,7 @@ SOURCE=.\src\FDM\JSBSim\FGRotor.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRocket.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGScript.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2438,7 +2363,7 @@ SOURCE=.\src\FDM\JSBSim\FGRocket.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRocket.h\r
+SOURCE=.\src\FDM\JSBSim\FGScript.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2453,7 +2378,7 @@ SOURCE=.\src\FDM\JSBSim\FGRocket.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGScript.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGState.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2468,7 +2393,7 @@ SOURCE=.\src\FDM\JSBSim\FGScript.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGScript.h\r
+SOURCE=.\src\FDM\JSBSim\FGState.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2483,7 +2408,7 @@ SOURCE=.\src\FDM\JSBSim\FGScript.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGState.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTable.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2498,7 +2423,7 @@ SOURCE=.\src\FDM\JSBSim\FGState.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGState.h\r
+SOURCE=.\src\FDM\JSBSim\FGTable.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2513,7 +2438,7 @@ SOURCE=.\src\FDM\JSBSim\FGState.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTable.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGThruster.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2528,7 +2453,7 @@ SOURCE=.\src\FDM\JSBSim\FGTable.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTable.h\r
+SOURCE=.\src\FDM\JSBSim\FGThruster.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2543,7 +2468,7 @@ SOURCE=.\src\FDM\JSBSim\FGTable.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGThruster.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTrim.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2558,7 +2483,7 @@ SOURCE=.\src\FDM\JSBSim\FGThruster.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGThruster.h\r
+SOURCE=.\src\FDM\JSBSim\FGTrim.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2573,7 +2498,7 @@ SOURCE=.\src\FDM\JSBSim\FGThruster.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTranslation.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTrimAxis.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2588,7 +2513,7 @@ SOURCE=.\src\FDM\JSBSim\FGTranslation.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTranslation.h\r
+SOURCE=.\src\FDM\JSBSim\FGTrimAxis.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2603,7 +2528,7 @@ SOURCE=.\src\FDM\JSBSim\FGTranslation.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTrim.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2618,7 +2543,7 @@ SOURCE=.\src\FDM\JSBSim\FGTrim.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTrim.h\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2633,7 +2558,7 @@ SOURCE=.\src\FDM\JSBSim\FGTrim.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTrimAxis.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGEngine.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2648,7 +2573,7 @@ SOURCE=.\src\FDM\JSBSim\FGTrimAxis.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTrimAxis.h\r
+SOURCE=.\src\FDM\JSBSim\FGEngine.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2663,7 +2588,7 @@ SOURCE=.\src\FDM\JSBSim\FGTrimAxis.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTank.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2678,7 +2603,7 @@ SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTurbine.h\r
+SOURCE=.\src\FDM\JSBSim\FGTank.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2693,7 +2618,7 @@ SOURCE=.\src\FDM\JSBSim\FGTurbine.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGUtility.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGfdmSocket.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2708,7 +2633,7 @@ SOURCE=.\src\FDM\JSBSim\FGUtility.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGUtility.h\r
+SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2723,7 +2648,7 @@ SOURCE=.\src\FDM\JSBSim\FGUtility.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGEngine.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2738,7 +2663,7 @@ SOURCE=.\src\FDM\JSBSim\FGEngine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGEngine.h\r
+SOURCE=.\src\FDM\JSBSim\FGTurbine.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2753,7 +2678,7 @@ SOURCE=.\src\FDM\JSBSim\FGEngine.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTank.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPropertyManager.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2768,7 +2693,7 @@ SOURCE=.\src\FDM\JSBSim\FGTank.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTank.h\r
+SOURCE=.\src\FDM\JSBSim\FGPropertyManager.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2783,7 +2708,7 @@ SOURCE=.\src\FDM\JSBSim\FGTank.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGfdmSocket.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPropagate.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2798,7 +2723,7 @@ SOURCE=.\src\FDM\JSBSim\FGfdmSocket.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h\r
+SOURCE=.\src\FDM\JSBSim\FGPropagate.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2813,7 +2738,7 @@ SOURCE=.\src\FDM\JSBSim\FGfdmSocket.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGLocation.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2828,7 +2753,7 @@ SOURCE=.\src\FDM\JSBSim\FGTurbine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGTurbine.h\r
+SOURCE=.\src\FDM\JSBSim\FGLocation.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2843,7 +2768,7 @@ SOURCE=.\src\FDM\JSBSim\FGTurbine.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropertyManager.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGQuaternion.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2858,7 +2783,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropertyManager.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropertyManager.h\r
+SOURCE=.\src\FDM\JSBSim\FGQuaternion.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2873,7 +2798,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropertyManager.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGSimTurbine.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGElectric.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -2888,7 +2813,7 @@ SOURCE=.\src\FDM\JSBSim\FGSimTurbine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGSimTurbine.h\r
+SOURCE=.\src\FDM\JSBSim\FGElectric.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6714,7 +6639,7 @@ SOURCE=.\src\FDM\YASim\Model.hpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\PistonEngine.cpp\r
+SOURCE=.\src\FDM\YASim\PropEngine.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6729,7 +6654,7 @@ SOURCE=.\src\FDM\YASim\PistonEngine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\PistonEngine.hpp\r
+SOURCE=.\src\FDM\YASim\PropEngine.hpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6744,7 +6669,7 @@ SOURCE=.\src\FDM\YASim\PistonEngine.hpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\PropEngine.cpp\r
+SOURCE=.\src\FDM\YASim\Propeller.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6759,7 +6684,7 @@ SOURCE=.\src\FDM\YASim\PropEngine.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\PropEngine.hpp\r
+SOURCE=.\src\FDM\YASim\Propeller.hpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6774,7 +6699,7 @@ SOURCE=.\src\FDM\YASim\PropEngine.hpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\Propeller.cpp\r
+SOURCE=.\src\FDM\YASim\Engine.hpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6789,7 +6714,52 @@ SOURCE=.\src\FDM\YASim\Propeller.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\YASim\Propeller.hpp\r
+SOURCE=.\src\FDM\YASim\PistonEngine.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\PistonEngine.hpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\TurbineEngine.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_YASim"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_YASim"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\TurbineEngine.hpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -7634,6 +7604,51 @@ SOURCE=.\src\GUI\AirportList.hxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\GUI\layout.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_GUI"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\GUI\layout-props.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_GUI"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_GUI"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\GUI\layout.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
 # End Group\r
 # Begin Group "Lib_Input"\r
@@ -8505,6 +8520,36 @@ SOURCE=.\src\Main\viewmgr.hxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_os.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Main\fg_os.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Main"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Main"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Model"\r
@@ -8844,43 +8889,73 @@ SOURCE=.\src\AIModel\AIThermal.cxx
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_MultiPlayer"\r
+# Begin Source File\r
 \r
-# PROP Default_Filter ""\r
+SOURCE=.\src\AIModel\AIFlightPlan.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\multiplayrxmgr.cxx\r
+SOURCE=.\src\AIModel\AIFlightPlan.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_MultiPlayer"\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_MultiPlayer"\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\multiplayrxmgr.hxx\r
+SOURCE=.\src\AIModel\AIScenario.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_MultiPlayer"\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_MultiPlayer"\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\multiplaytxmgr.cxx\r
+SOURCE=.\src\AIModel\AIScenario.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_AIModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_AIModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_MultiPlayer"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\MultiPlayer\multiplayrxmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8895,7 +8970,7 @@ SOURCE=.\src\MultiPlayer\multiplaytxmgr.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\multiplaytxmgr.hxx\r
+SOURCE=.\src\MultiPlayer\multiplayrxmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8910,7 +8985,7 @@ SOURCE=.\src\MultiPlayer\multiplaytxmgr.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\mpplayer.cxx\r
+SOURCE=.\src\MultiPlayer\multiplaytxmgr.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8925,7 +9000,7 @@ SOURCE=.\src\MultiPlayer\mpplayer.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\mpplayer.hxx\r
+SOURCE=.\src\MultiPlayer\multiplaytxmgr.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8940,7 +9015,7 @@ SOURCE=.\src\MultiPlayer\mpplayer.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\MultiPlayer\mpmessages.hxx\r
+SOURCE=.\src\MultiPlayer\mpplayer.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -8953,43 +9028,43 @@ SOURCE=.\src\MultiPlayer\mpmessages.hxx
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Navaids"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\fix.hxx\r
+SOURCE=.\src\MultiPlayer\mpplayer.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Navaids"\r
+# PROP Intermediate_Dir "Release\Lib_MultiPlayer"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Navaids"\r
+# PROP Intermediate_Dir "Debug\Lib_MultiPlayer"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\fixlist.hxx\r
+SOURCE=.\src\MultiPlayer\mpmessages.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Navaids"\r
+# PROP Intermediate_Dir "Release\Lib_MultiPlayer"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Navaids"\r
+# PROP Intermediate_Dir "Debug\Lib_MultiPlayer"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Navaids"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\fixlist.cxx\r
+SOURCE=.\src\Navaids\navdb.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9004,7 +9079,7 @@ SOURCE=.\src\Navaids\fixlist.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\ils.hxx\r
+SOURCE=.\src\Navaids\navdb.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9019,7 +9094,7 @@ SOURCE=.\src\Navaids\ils.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\ilslist.hxx\r
+SOURCE=.\src\Navaids\fix.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9034,7 +9109,7 @@ SOURCE=.\src\Navaids\ilslist.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\ilslist.cxx\r
+SOURCE=.\src\Navaids\fixlist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9049,7 +9124,7 @@ SOURCE=.\src\Navaids\ilslist.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\mkrbeacons.hxx\r
+SOURCE=.\src\Navaids\fixlist.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9064,7 +9139,7 @@ SOURCE=.\src\Navaids\mkrbeacons.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\mkrbeacons.cxx\r
+SOURCE=.\src\Navaids\nav.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9079,7 +9154,7 @@ SOURCE=.\src\Navaids\mkrbeacons.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\nav.hxx\r
+SOURCE=.\src\Navaids\navlist.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9094,7 +9169,7 @@ SOURCE=.\src\Navaids\nav.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\navlist.hxx\r
+SOURCE=.\src\Navaids\navlist.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -9109,7 +9184,7 @@ SOURCE=.\src\Navaids\navlist.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Navaids\navlist.cxx\r
+SOURCE=.\src\Navaids\navrecord.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -10439,6 +10514,100 @@ SOURCE=.\src\Time\tmp.hxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_Traffic"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\SchedFlight.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\SchedFlight.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\Schedule.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\Schedule.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\TrafficMgr.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Traffic\TrafficMgr.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Traffic"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Traffic"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Source File\r

diff --git a/NEWS b/NEWS
index 68ff641d6f4e49b8e6c8cd201e1516f5879384d7..86d266e6fb9d63a6711de28d893a9242550034cc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+New in 0.9.5-pre1
+* July 15, 2004
+
+* New AIModel based air traffic subsystem (Durk Talsma)
+* Updates to the AIModel subsystem.
+* Switched audio subsystem from plib's "sl" to OpenAL.
+* Added support for SDL (pre-compile time configuration option.)
+* Threaded tile loader now enabled by default.
+* Overhauled Nav database code to directly support Robin Peel's default format.
+* Synced with latest JSBSim developments.
+* YASim now supports a nasal (script) based fuel management system.
+* YASim adds a simple turbo prop engine model.
+* Added an xml based gui/widget layout system for building dialog boxes.
+* Make gui windows dragable/repositionable.
+* Hide the mouse pointer when it sits idle.  Mouse pointer reappears
+  on any mouse motion.
+* The GPS module has been overhauled.
+* New joystick configurations added: Cyborg Evo, Top Gun Fox2 Pro USB,
+  MacAlly iStick USB, SideWinder Precision Pro (on Windows.)
+* Updated aircraft: A-10, AN-225, B-52F, BAC-TSR2, T-37, T-38, YF-23, Beech-99,
+  BO-105 (helicopter), DC-3, F-104, F-16, Fokker 50, Fokker 100, Pilatus PC-7.
+* New aircraft: Concorde, MD-11, Spitfire IIA, TU-154.
+* Updated airport, runway, taxiway, windsock, beacon, and tower data.
+* Updated world scenery based on SRTM terrain data.  New scenery includes
+  accurate radio towers for the USA.
+
+
 New in 0.9.4
 * March 26, 2004
 

diff --git a/configure.ac b/configure.ac
index 797e353fa90e30382cfb2424bccbb2eea87c4903..007191ffc93e6a9082806e87fba5a8a1b9462927 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 0.9.4)
+AM_INIT_AUTOMAKE(FlightGear, 0.9.5-pre1)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -368,7 +368,7 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.7.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.0 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
@@ -409,7 +409,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for simgear 0.3.5 or newer])
+AC_MSG_CHECKING([for simgear 0.3.6 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -420,7 +420,7 @@ AC_TRY_RUN([
 
 #define MIN_MAJOR 0
 #define MIN_MINOR 3
-#define MIN_MICRO 5
+#define MIN_MICRO 6
 
 int main() {
     int major, minor, micro;

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 36d279fcf1ad459cfc5c0c91a82141a8509cfb34..f95fb63358a81bf08b2acd19f8d059697f59d2ff 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1542,7 +1542,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "0.9.4";
+    static char required_version[] = "0.9.5-pre1";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application

diff --git a/utils/Makefile.am b/utils/Makefile.am
index a8dfe3d5e3e58ff6438b2cdb8d401e865fbd0bc6..bb771a59dee192365ec3fe5e9e0835088e754bb9 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,3 +1,4 @@
+DIST_SUBDIRS = TerraSync Modeller js_server fgadmin
+
 SUBDIRS = TerraSync Modeller js_server
 
-DIST_SUBDIRS = fgadmin