From a4600f85c7ab155d0273ea0a9ac115c0815754ef Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 5 Dec 2002 15:31:09 +0000 Subject: [PATCH 1/1] Updates for 0.9.1 --- FlightGear.dsp | 760 +++++++++++++++++++++++++++++++++++++++------- Makefile.am | 1 - NEWS | 9 + configure.ac | 2 +- src/Main/main.cxx | 2 +- 5 files changed, 667 insertions(+), 107 deletions(-) diff --git a/FlightGear.dsp b/FlightGear.dsp index 4e9cfd223..4b457c5b8 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -467,6 +467,36 @@ SOURCE=.\src\ATC\ATCutils.cxx # End Source File # Begin Source File +SOURCE=.\src\ATC\ATCProjection.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\ATCProjection.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" @@ -527,6 +557,36 @@ SOURCE=.\src\ATC\AIEntity.cxx # End Source File # Begin Source File +SOURCE=.\src\ATC\AIPlane.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\AIPlane.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" @@ -655,6 +715,36 @@ SOURCE=.\src\Cockpit\cockpit.hxx # End Source File # Begin Source File +SOURCE=.\src\Cockpit\dme.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Cockpit\dme.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\Cockpit\hud.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -910,6 +1000,66 @@ SOURCE=.\src\Cockpit\kt_70.hxx # End Source File # Begin Source File +SOURCE=.\src\Cockpit\marker_beacon.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Cockpit\marker_beacon.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Cockpit\navcom.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Cockpit\navcom.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Cockpit" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Cockpit" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\Cockpit\panel.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -1223,6 +1373,40 @@ SOURCE=.\src\FDM\Balloon\BalloonSim.h !ENDIF +# End Source File +# End Group +# Begin Group "Lib_ExternalNet" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\src\FDM\ExternalNet\ExternalNet.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_ExternalNet" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_ExternalNet" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\ExternalNet\ExternalNet.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_ExternalNet" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_ExternalNet" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_JSBSim" @@ -2535,6 +2719,21 @@ SOURCE=.\src\FDM\JSBSim\FGTurbine.h # End Source File # Begin Source File +SOURCE=.\src\FDM\JSBSim\FGPropertyManager.cpp + +!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\FGPropertyManager.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -3455,6 +3654,21 @@ SOURCE=.\src\FDM\LaRCsim\ls_interface.h !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\LaRCsim\uiuc_getwind.c + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_LaRCsim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_LaRCsim" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_UIUCModel" @@ -4122,36 +4336,6 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_iceboot.h # End Source File # Begin Source File -SOURCE=.\src\FDM\UIUCModel\uiuc_ice_rates.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_ice_rates.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_iced_nonlin.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -4902,6 +5086,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_menu.h # End Source File # Begin Source File +SOURCE=.\src\FDM\UIUCModel\uiuc_pah_ap.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_pah_ap.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_parsefile.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5690,7 +5904,7 @@ SOURCE=.\src\FDM\Balloon.h # End Source File # Begin Source File -SOURCE=.\src\FDM\External.cxx +SOURCE=.\src\FDM\flight.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5705,7 +5919,7 @@ SOURCE=.\src\FDM\External.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\External.hxx +SOURCE=.\src\FDM\flight.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5720,7 +5934,7 @@ SOURCE=.\src\FDM\External.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\ExternalNet.cxx +SOURCE=.\src\FDM\IO360.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5735,7 +5949,7 @@ SOURCE=.\src\FDM\ExternalNet.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\ExternalNet.hxx +SOURCE=.\src\FDM\IO360.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5750,7 +5964,7 @@ SOURCE=.\src\FDM\ExternalNet.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\flight.cxx +SOURCE=.\src\FDM\LaRCsim.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5765,7 +5979,7 @@ SOURCE=.\src\FDM\flight.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\flight.hxx +SOURCE=.\src\FDM\LaRCsim.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5780,7 +5994,7 @@ SOURCE=.\src\FDM\flight.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\IO360.cxx +SOURCE=.\src\FDM\LaRCsimIC.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5795,7 +6009,7 @@ SOURCE=.\src\FDM\IO360.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\IO360.hxx +SOURCE=.\src\FDM\LaRCsimIC.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5810,7 +6024,7 @@ SOURCE=.\src\FDM\IO360.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\LaRCsim.cxx +SOURCE=.\src\FDM\MagicCarpet.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5825,7 +6039,7 @@ SOURCE=.\src\FDM\LaRCsim.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\LaRCsim.hxx +SOURCE=.\src\FDM\MagicCarpet.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5840,7 +6054,7 @@ SOURCE=.\src\FDM\LaRCsim.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\LaRCsimIC.cxx +SOURCE=.\src\FDM\UFO.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5855,7 +6069,7 @@ SOURCE=.\src\FDM\LaRCsimIC.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\LaRCsimIC.hxx +SOURCE=.\src\FDM\UFO.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5870,7 +6084,7 @@ SOURCE=.\src\FDM\LaRCsimIC.hxx # End Source File # Begin Source File -SOURCE=.\src\FDM\MagicCarpet.cxx +SOURCE=.\src\FDM\NullFDM.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5885,7 +6099,7 @@ SOURCE=.\src\FDM\MagicCarpet.cxx # End Source File # Begin Source File -SOURCE=.\src\FDM\MagicCarpet.hxx +SOURCE=.\src\FDM\NullFDM.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5898,73 +6112,73 @@ SOURCE=.\src\FDM\MagicCarpet.hxx !ENDIF # End Source File +# End Group +# Begin Group "Lib_GUI" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\src\FDM\UFO.cxx +SOURCE=.\src\GUI\new_gui.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Flight" +# PROP Intermediate_Dir "Release\Lib_GUI" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Flight" +# PROP Intermediate_Dir "Debug\Lib_GUI" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\FDM\UFO.hxx +SOURCE=.\src\GUI\new_gui.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Flight" +# PROP Intermediate_Dir "Release\Lib_GUI" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Flight" +# PROP Intermediate_Dir "Debug\Lib_GUI" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\FDM\NullFDM.cxx +SOURCE=.\src\GUI\gui.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Flight" +# PROP Intermediate_Dir "Release\Lib_GUI" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Flight" +# PROP Intermediate_Dir "Debug\Lib_GUI" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\FDM\NullFDM.hxx +SOURCE=.\src\GUI\gui.h !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Flight" +# PROP Intermediate_Dir "Release\Lib_GUI" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Flight" +# PROP Intermediate_Dir "Debug\Lib_GUI" !ENDIF # End Source File -# End Group -# Begin Group "Lib_GUI" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\src\GUI\apt_dlg.cxx +SOURCE=.\src\GUI\gui_funcs.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5979,7 +6193,7 @@ SOURCE=.\src\GUI\apt_dlg.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\apt_dlg.hxx +SOURCE=.\src\GUI\gui_local.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5994,7 +6208,7 @@ SOURCE=.\src\GUI\apt_dlg.hxx # End Source File # Begin Source File -SOURCE=.\src\GUI\gui.cxx +SOURCE=.\src\GUI\gui_local.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6009,7 +6223,7 @@ SOURCE=.\src\GUI\gui.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\gui.h +SOURCE=.\src\GUI\mouse.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6024,7 +6238,7 @@ SOURCE=.\src\GUI\gui.h # End Source File # Begin Source File -SOURCE=.\src\GUI\gui_funcs.cxx +SOURCE=.\src\GUI\preset_dlg.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6039,7 +6253,7 @@ SOURCE=.\src\GUI\gui_funcs.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\gui_local.cxx +SOURCE=.\src\GUI\preset_dlg.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6054,7 +6268,7 @@ SOURCE=.\src\GUI\gui_local.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\gui_local.hxx +SOURCE=.\src\GUI\prop_picker.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6069,7 +6283,7 @@ SOURCE=.\src\GUI\gui_local.hxx # End Source File # Begin Source File -SOURCE=.\src\GUI\mouse.cxx +SOURCE=.\src\GUI\prop_picker.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6084,7 +6298,7 @@ SOURCE=.\src\GUI\mouse.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\prop_picker.cxx +SOURCE=.\src\GUI\sgVec3Slider.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6099,7 +6313,7 @@ SOURCE=.\src\GUI\prop_picker.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\prop_picker.hxx +SOURCE=.\src\GUI\sgVec3Slider.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6114,7 +6328,7 @@ SOURCE=.\src\GUI\prop_picker.hxx # End Source File # Begin Source File -SOURCE=.\src\GUI\sgVec3Slider.cxx +SOURCE=.\src\GUI\trackball.c !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6129,7 +6343,7 @@ SOURCE=.\src\GUI\sgVec3Slider.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\sgVec3Slider.hxx +SOURCE=.\src\GUI\trackball.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6142,66 +6356,220 @@ SOURCE=.\src\GUI\sgVec3Slider.hxx !ENDIF # End Source File +# End Group +# Begin Group "Lib_Input" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\src\GUI\trackball.c +SOURCE=.\src\Input\input.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_GUI" +# PROP Intermediate_Dir "Release\Lib_Input" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_GUI" +# PROP Intermediate_Dir "Debug\Lib_Input" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\GUI\trackball.h +SOURCE=.\src\Input\input.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_GUI" +# PROP Intermediate_Dir "Release\Lib_Input" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_GUI" +# PROP Intermediate_Dir "Debug\Lib_Input" !ENDIF # End Source File # End Group -# Begin Group "Lib_Input" +# Begin Group "Lib_Instrumentation" # PROP Default_Filter "" # Begin Source File -SOURCE=.\src\Input\input.cxx +SOURCE=.\src\Instrumentation\instrument_mgr.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Input" +# PROP Intermediate_Dir "Release\Lib_Instrumentation" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Input" +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\Input\input.hxx +SOURCE=.\src\Instrumentation\instrument_mgr.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_Input" +# PROP Intermediate_Dir "Release\Lib_Instrumentation" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_Input" +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\airspeed_indicator.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\airspeed_indicator.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\altimeter.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\altimeter.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\attitude_indicator.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\attitude_indicator.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\heading_indicator.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\heading_indicator.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\vertical_speed_indicator.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Instrumentation\vertical_speed_indicator.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Instrumentation" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Instrumentation" !ENDIF @@ -6497,6 +6865,36 @@ SOURCE=.\src\Main\splash.hxx # End Source File # Begin Source File +SOURCE=.\src\Main\util.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\util.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\viewer.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7184,7 +7582,7 @@ SOURCE=.\src\Network\native_fdm.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\net_fdm.hxx +SOURCE=.\src\Network\net_ctrls.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7199,7 +7597,7 @@ SOURCE=.\src\Network\net_fdm.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\nmea.cxx +SOURCE=.\src\Network\net_fdm.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7214,7 +7612,7 @@ SOURCE=.\src\Network\nmea.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\nmea.hxx +SOURCE=.\src\Network\nmea.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7229,7 +7627,7 @@ SOURCE=.\src\Network\nmea.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\opengc.cxx +SOURCE=.\src\Network\nmea.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7244,7 +7642,7 @@ SOURCE=.\src\Network\opengc.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\opengc.hxx +SOURCE=.\src\Network\opengc.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7259,7 +7657,7 @@ SOURCE=.\src\Network\opengc.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\opengc_data.hxx +SOURCE=.\src\Network\opengc.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7274,7 +7672,7 @@ SOURCE=.\src\Network\opengc_data.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\props.cxx +SOURCE=.\src\Network\opengc_data.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7289,7 +7687,7 @@ SOURCE=.\src\Network\props.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\props.hxx +SOURCE=.\src\Network\props.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7304,7 +7702,7 @@ SOURCE=.\src\Network\props.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\pve.cxx +SOURCE=.\src\Network\props.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7319,7 +7717,7 @@ SOURCE=.\src\Network\pve.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\pve.hxx +SOURCE=.\src\Network\pve.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7334,7 +7732,7 @@ SOURCE=.\src\Network\pve.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\raw_ctrls.hxx +SOURCE=.\src\Network\pve.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7443,7 +7841,7 @@ SOURCE=.\src\Objects\apt_signs.hxx # End Source File # Begin Source File -SOURCE=.\src\Objects\dir_lights.cxx +SOURCE=.\src\Objects\newmat.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7458,7 +7856,7 @@ SOURCE=.\src\Objects\dir_lights.cxx # End Source File # Begin Source File -SOURCE=.\src\Objects\dir_lights.hxx +SOURCE=.\src\Objects\newmat.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7473,7 +7871,7 @@ SOURCE=.\src\Objects\dir_lights.hxx # End Source File # Begin Source File -SOURCE=.\src\Objects\newmat.cxx +SOURCE=.\src\Objects\matlib.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7488,7 +7886,7 @@ SOURCE=.\src\Objects\newmat.cxx # End Source File # Begin Source File -SOURCE=.\src\Objects\newmat.hxx +SOURCE=.\src\Objects\matlib.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7503,7 +7901,7 @@ SOURCE=.\src\Objects\newmat.hxx # End Source File # Begin Source File -SOURCE=.\src\Objects\matlib.cxx +SOURCE=.\src\Objects\obj.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7518,7 +7916,7 @@ SOURCE=.\src\Objects\matlib.cxx # End Source File # Begin Source File -SOURCE=.\src\Objects\matlib.hxx +SOURCE=.\src\Objects\obj.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7533,7 +7931,7 @@ SOURCE=.\src\Objects\matlib.hxx # End Source File # Begin Source File -SOURCE=.\src\Objects\obj.cxx +SOURCE=.\src\Objects\pt_lights.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7548,7 +7946,7 @@ SOURCE=.\src\Objects\obj.cxx # End Source File # Begin Source File -SOURCE=.\src\Objects\obj.hxx +SOURCE=.\src\Objects\pt_lights.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -7943,6 +8341,160 @@ SOURCE=.\src\Sound\soundmgr.hxx !ENDIF +# End Source File +# End Group +# Begin Group "Lib_Systems" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\src\Systems\system_mgr.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\system_mgr.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\electrical.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\electrical.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\pitot.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\pitot.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\static.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\static.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\vacuum.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Systems\vacuum.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Systems" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Systems" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_Time" diff --git a/Makefile.am b/Makefile.am index 61362b2c6..ac1c7992e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,6 @@ EXTRA_DIST = \ Thanks \ acinclude.m4 \ autogen.sh \ - irix-hack.sh \ FlightGear.dsp \ FlightGear.dsw diff --git a/NEWS b/NEWS index 32be4a496..ec4fc1acb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +New in 0.9.1 +* December 5, 2002 + +* Fixes a problem with a missing file in the source distribution of 0.9.0 +* Updates to AI aircraft subsystem (this is a work in progress) +* Added a canned ATC voice handling class (using prerecorded voice snippets.) +* Added voice ATIS + + New in 0.9.0 * December 3, 2002 diff --git a/configure.ac b/configure.ac index 1b739fec3..eeadd5236 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([src/Aircraft/aircraft.cxx]) AC_PREREQ(2.52) # Initialize the automake stuff -AM_INIT_AUTOMAKE(FlightGear, 0.9.0) +AM_INIT_AUTOMAKE(FlightGear, 0.9.1) # Checks for programs. AC_PROG_MAKE_SET diff --git a/src/Main/main.cxx b/src/Main/main.cxx index 5a68ab140..8edb7bd7d 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -1551,7 +1551,7 @@ static bool fgMainInit( int argc, char **argv ) { fgInitFGRoot(argc, argv); // Check for the correct base package version - static char required_version[] = "0.9.0"; + static char required_version[] = "0.9.1"; string base_version = fgBasePackageVersion(); if ( !(base_version == required_version) ) { // tell the operator how to use this application -- 2.39.2