This set of changes touches a *lot* of files. The main goal here is to

[flightgear.git] / FlightGear.dsp

diff --git a/FlightGear.dsp b/FlightGear.dsp
index e31f80f9c952165204afb6747edd1763e24fd8c8..1415e88fc128a2846ba469981980e2d6ac629d55 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -30,52 +30,33 @@ RSC=rc.exe
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I ".\src" /I ".\src\Include" /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /D "HAVE_CONFIG_H"  /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\simgear\metakit\include" /D "FGFS" /D "HAVE_CONFIG_H" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c\r
 # SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0xc09 /d "NDEBUG"\r
 # ADD RSC /l 0xc09 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386  /libpath:"..\plib" ssg.lib sg.lib pui.lib fnt.lib js.lib ul.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\src" /I ".\src\Include" /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0xc09 /d "_DEBUG"\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c /D "HAVE_CONFIG_H"  /I ".." /I ".\src" /I ".\src\include" /I "..\SimGear" /I "..\SimGear\simgear\metakit\include" /D "FGFS" /D "HAVE_CONFIG_H"\r
 # ADD RSC /l 0xc09 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib simgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib mk4vc60_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\lib" /libpath:"\lib\simgear" /libpath:"\lib\plib"\r
+# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept  /libpath:"..\plib" ssg.lib sg.lib pui.lib fnt.lib js.lib ul.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib"\r
 \r
 !ENDIF \r
 \r
@@ -83,18 +64,6 @@ LINK32=link.exe
 \r
 # Name "FlightGear - Win32 Release"\r
 # Name "FlightGear - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
 # Begin Group "Lib_Aircraft"\r
 \r
 # PROP Default_Filter ""\r
@@ -679,6 +648,36 @@ SOURCE=.\src\FDM\Balloon\BalloonSim.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\JSBSim\FGAerodynamics.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\FGAerodynamics.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\FGAircraft.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -829,7 +828,7 @@ SOURCE=.\src\FDM\JSBSim\FGConfigFile.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGControls.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGDefs.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -844,7 +843,7 @@ SOURCE=.\src\FDM\JSBSim\FGControls.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGControls.h\r
+SOURCE=.\src\FDM\JSBSim\FGFCS.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -859,7 +858,7 @@ SOURCE=.\src\FDM\JSBSim\FGControls.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGDefs.h\r
+SOURCE=.\src\FDM\JSBSim\FGFCS.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -874,7 +873,7 @@ SOURCE=.\src\FDM\JSBSim\FGDefs.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGFCS.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -889,7 +888,7 @@ SOURCE=.\src\FDM\JSBSim\FGFCS.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGFCS.h\r
+SOURCE=.\src\FDM\JSBSim\FGFDMExec.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -904,7 +903,7 @@ SOURCE=.\src\FDM\JSBSim\FGFCS.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGFactorGroup.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -919,7 +918,7 @@ SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGFDMExec.h\r
+SOURCE=.\src\FDM\JSBSim\FGFactorGroup.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -964,6 +963,36 @@ SOURCE=.\src\FDM\JSBSim\FGForce.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\JSBSim\FGInertial.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\FGInertial.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\FGInitialCondition.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -1024,6 +1053,36 @@ SOURCE=.\src\FDM\JSBSim\FGLGear.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\JSBSim\FGMassBalance.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\FGMassBalance.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\FGMatrix.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -2337,21 +2396,6 @@ SOURCE=.\src\FDM\LaRCsim\ls_sym.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\LaRCsim\ls_trim.c\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_LaRCsim"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_LaRCsim"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\LaRCsim\ls_types.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -3121,6 +3165,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_engine.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_fog.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_fog.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_gear.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -3451,6 +3525,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_map_engine.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_fog.cpp\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_UIUCModel"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_UIUCModel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\UIUCModel\uiuc_map_fog.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_map_geometry.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -4344,36 +4448,6 @@ SOURCE=.\src\GUI\mouse.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\GUI\net_dlg.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\net_dlg.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_GUI"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_GUI"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\GUI\sgVec3Slider.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -4433,35 +4507,35 @@ SOURCE=.\src\GUI\trackball.h
 \r
 # End Source File\r
 # End Group\r
-# Begin Group "Lib_Joystick"\r
+# Begin Group "Lib_Input"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Joystick\joystick.cxx\r
+SOURCE=.\src\Input\input.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Joystick"\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Joystick"\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Joystick\joystick.hxx\r
+SOURCE=.\src\Input\input.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Joystick"\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Joystick"\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
 \r
 !ENDIF \r
 \r
@@ -4487,7 +4561,7 @@ SOURCE=.\src\Main\main.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\bfi.cxx\r
+SOURCE=.\src\Main\fg_commands.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -4502,7 +4576,7 @@ SOURCE=.\src\Main\bfi.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\bfi.hxx\r
+SOURCE=.\src\Main\fg_commands.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -4667,36 +4741,6 @@ SOURCE=.\src\Main\globals.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Main\keyboard.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\keyboard.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
@@ -5140,7 +5184,7 @@ SOURCE=.\src\Network\garmin.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\joyclient.cxx\r
+SOURCE=.\src\Network\httpd.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5155,7 +5199,7 @@ SOURCE=.\src\Network\joyclient.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\joyclient.hxx\r
+SOURCE=.\src\Network\httpd.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5170,7 +5214,7 @@ SOURCE=.\src\Network\joyclient.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\native.cxx\r
+SOURCE=.\src\Network\joyclient.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5185,7 +5229,7 @@ SOURCE=.\src\Network\native.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\native.hxx\r
+SOURCE=.\src\Network\joyclient.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5200,7 +5244,7 @@ SOURCE=.\src\Network\native.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.cxx\r
+SOURCE=.\src\Network\native.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5215,7 +5259,7 @@ SOURCE=.\src\Network\nmea.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.hxx\r
+SOURCE=.\src\Network\native.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5230,7 +5274,7 @@ SOURCE=.\src\Network\nmea.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.cxx\r
+SOURCE=.\src\Network\native_ctrls.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5245,7 +5289,7 @@ SOURCE=.\src\Network\props.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.hxx\r
+SOURCE=.\src\Network\native_ctrls.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5260,7 +5304,7 @@ SOURCE=.\src\Network\props.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.cxx\r
+SOURCE=.\src\Network\native_fdm.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5275,7 +5319,7 @@ SOURCE=.\src\Network\pve.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.hxx\r
+SOURCE=.\src\Network\native_fdm.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5290,7 +5334,7 @@ SOURCE=.\src\Network\pve.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\ray.cxx\r
+SOURCE=.\src\Network\nmea.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5305,7 +5349,7 @@ SOURCE=.\src\Network\ray.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\ray.hxx\r
+SOURCE=.\src\Network\nmea.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5320,7 +5364,7 @@ SOURCE=.\src\Network\ray.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\rul.cxx\r
+SOURCE=.\src\Network\props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5335,7 +5379,7 @@ SOURCE=.\src\Network\rul.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\rul.hxx\r
+SOURCE=.\src\Network\props.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5348,111 +5392,122 @@ SOURCE=.\src\Network\rul.hxx
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_NetworkOLK"\r
+# Begin Source File\r
 \r
-# PROP Default_Filter ""\r
+SOURCE=.\src\Network\pve.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\net_send.cxx\r
+SOURCE=.\src\Network\pve.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\net_hud.cxx\r
+SOURCE=.\src\Network\raw_ctrls.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\network.cxx\r
+SOURCE=.\src\Network\raw_fdm.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\network.h\r
+SOURCE=.\src\Network\ray.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\fgd.h\r
+SOURCE=.\src\Network\ray.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\features.cxx\r
+SOURCE=.\src\Network\rul.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\NetworkOLK\features.hxx\r
+SOURCE=.\src\Network\rul.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Release\Lib_Network"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_NetworkOLK"\r
+# PROP Intermediate_Dir "Debug\Lib_Network"\r
 \r
 !ENDIF \r
 \r
@@ -5463,6 +5518,36 @@ SOURCE=.\src\NetworkOLK\features.hxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Objects\apt_signs.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\apt_signs.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
@@ -6057,40 +6142,6 @@ SOURCE=.\src\Time\tmp.hxx
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# End Group\r
-# Begin Group "Lib_Weather"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=.\src\Weather\weather.cxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Weather"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Weather"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\Weather\weather.hxx\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_Weather"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_Weather"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_WeatherCM"\r
@@ -6517,5 +6568,33 @@ SOURCE=.\src\WeatherCM\FGWindItem.h
 \r
 # End Source File\r
 # End Group\r
+\r
+# Begin Source File\r
+\r
+SOURCE = .\src\Include\config.h-msvc6\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\src\Include\config.h-msvc6\r
+\r
+".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\src\Include\config.h-msvc6\r
+\r
+".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
 # End Target\r
 # End Project\r