MSVC updates.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 28694d0790893dc5c771f76ce2da88c4b4debccb..a2ad297dd21d5d6f0555cb0a5c9fd9eba98f8137 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 BSC32=bscmake.exe\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\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
+# 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 sl.lib ul.lib ssgaux.lib net.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
@@ -56,7 +56,7 @@ LINK32=link.exe
 BSC32=bscmake.exe\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\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
+# 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 sl.lib ul.lib ssgaux.lib net.lib /libpath:"..\SimGear" SimGear.lib /libpath:"..\SimGear\simgear\metakit\builds" mk4vc60s_d.lib"\r
 \r
 !ENDIF \r
 \r
@@ -1297,7 +1297,7 @@ SOURCE=.\src\FDM\JSBSim\FGMassBalance.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGMatrix.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGMatrix33.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1312,7 +1312,7 @@ SOURCE=.\src\FDM\JSBSim\FGMatrix.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGMatrix.h\r
+SOURCE=.\src\FDM\JSBSim\FGMatrix33.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1327,7 +1327,7 @@ SOURCE=.\src\FDM\JSBSim\FGMatrix.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGMatrix33.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGModel.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1342,7 +1342,7 @@ SOURCE=.\src\FDM\JSBSim\FGMatrix33.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGMatrix33.h\r
+SOURCE=.\src\FDM\JSBSim\FGModel.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1357,7 +1357,7 @@ SOURCE=.\src\FDM\JSBSim\FGMatrix33.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGModel.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGNozzle.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1372,7 +1372,7 @@ SOURCE=.\src\FDM\JSBSim\FGModel.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGModel.h\r
+SOURCE=.\src\FDM\JSBSim\FGNozzle.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1387,7 +1387,7 @@ SOURCE=.\src\FDM\JSBSim\FGModel.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGNozzle.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGOutput.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1402,7 +1402,7 @@ SOURCE=.\src\FDM\JSBSim\FGNozzle.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGNozzle.h\r
+SOURCE=.\src\FDM\JSBSim\FGOutput.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1417,7 +1417,7 @@ SOURCE=.\src\FDM\JSBSim\FGNozzle.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGOutput.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPiston.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1432,7 +1432,7 @@ SOURCE=.\src\FDM\JSBSim\FGOutput.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGOutput.h\r
+SOURCE=.\src\FDM\JSBSim\FGPiston.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1447,7 +1447,7 @@ SOURCE=.\src\FDM\JSBSim\FGOutput.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPiston.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPropeller.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1462,7 +1462,7 @@ SOURCE=.\src\FDM\JSBSim\FGPiston.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPiston.h\r
+SOURCE=.\src\FDM\JSBSim\FGPropeller.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1477,7 +1477,7 @@ SOURCE=.\src\FDM\JSBSim\FGPiston.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropeller.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPropulsion.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1492,7 +1492,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropeller.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropeller.h\r
+SOURCE=.\src\FDM\JSBSim\FGPropulsion.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1507,7 +1507,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropeller.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropulsion.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGPosition.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1522,7 +1522,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropulsion.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPropulsion.h\r
+SOURCE=.\src\FDM\JSBSim\FGPosition.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1537,7 +1537,7 @@ SOURCE=.\src\FDM\JSBSim\FGPropulsion.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPosition.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGRotation.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1552,7 +1552,7 @@ SOURCE=.\src\FDM\JSBSim\FGPosition.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGPosition.h\r
+SOURCE=.\src\FDM\JSBSim\FGRotation.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1567,7 +1567,7 @@ SOURCE=.\src\FDM\JSBSim\FGPosition.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGRotation.cpp\r
+SOURCE=.\src\FDM\JSBSim\FGRocket.cpp\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1582,7 +1582,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\FGRocket.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -1597,7 +1597,7 @@ SOURCE=.\src\FDM\JSBSim\FGRotation.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
@@ -1612,7 +1612,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
@@ -4580,6 +4580,21 @@ SOURCE=.\src\FDM\YASim\Wing.cpp
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\FDM\YASim\SimpleJet.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
 # End Group\r
 # Begin Group "Lib_Flight"\r
@@ -5732,6 +5747,36 @@ SOURCE=.\src\Network\protocol.hxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\src\Network\atc610x.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\Network\atc610x.hxx\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\Network\atlas.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -5942,7 +5987,7 @@ SOURCE=.\src\Network\native_fdm.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.cxx\r
+SOURCE=.\src\Network\net_fdm.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5957,7 +6002,7 @@ SOURCE=.\src\Network\nmea.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.hxx\r
+SOURCE=.\src\Network\nmea.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5972,7 +6017,7 @@ SOURCE=.\src\Network\nmea.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\opengc.cxx\r
+SOURCE=.\src\Network\nmea.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5987,7 +6032,7 @@ SOURCE=.\src\Network\opengc.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\opengc.hxx\r
+SOURCE=.\src\Network\opengc.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6002,7 +6047,7 @@ SOURCE=.\src\Network\opengc.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\opengc_data.hxx\r
+SOURCE=.\src\Network\opengc.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6017,7 +6062,7 @@ SOURCE=.\src\Network\opengc_data.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.cxx\r
+SOURCE=.\src\Network\opengc_data.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6032,7 +6077,7 @@ SOURCE=.\src\Network\props.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.hxx\r
+SOURCE=.\src\Network\props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6047,7 +6092,7 @@ SOURCE=.\src\Network\props.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.cxx\r
+SOURCE=.\src\Network\props.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6062,7 +6107,7 @@ SOURCE=.\src\Network\pve.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.hxx\r
+SOURCE=.\src\Network\pve.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6077,7 +6122,7 @@ SOURCE=.\src\Network\pve.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\raw_ctrls.hxx\r
+SOURCE=.\src\Network\pve.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -6092,7 +6137,7 @@ SOURCE=.\src\Network\raw_ctrls.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\raw_fdm.hxx\r
+SOURCE=.\src\Network\raw_ctrls.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r

diff --git a/am2dsp.cfg b/am2dsp.cfg
index a1c425a4db9a4425fca12aca9b72e08313bdebaa..64673287064717a66840b82ffb2aef159f3f4cea 100644 (file)
--- a/am2dsp.cfg
+++ b/am2dsp.cfg
@@ -24,8 +24,10 @@ add_lib = ssg
 add_lib = sg
 add_lib = pui
 add_lib = fnt
-add_lib = js
+add_lib = sl
 add_lib = ul
+add_lib = ssgaux
+add_lib = net
 
 #lib_path = ..\SimGear\%CFG%
 lib_path = ..\SimGear

diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index 9e9a34708972e1789e252f32babe3bd2965a4672..30ae5c9d211d09654ad6818f4efcba25bb796f43 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -1,4 +1,5 @@
-/* Special single config.h for MSVC6 build - Geoff McLane - 11 Nov, 2001  */
+
+/* Special single config.h for MSVC6 build - Geoff McLane - 22 Jan, 2002  */
 
 /* Define if the X Window System is missing or not being used.  */
 #define X_DISPLAY_MISSING 1
@@ -19,7 +20,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC6-FGFS32-0.7.8"
+#define FLIGHTGEAR_VERSION "MSVC6-WIN32-0.7.9"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -160,3 +161,7 @@
 #define HAVE_MEMORY_H 1
 
 #define HAVE_MEMCPY 1
+
+#define  ENABLE_AUDIO_SUPPORT
+
+// eof - config.h-msvc6 - single flightgear config.h file

diff --git a/src/Network/Makefile.am b/src/Network/Makefile.am
index 2343168056317af533e6c61f972e624400ea655f..7766c0977e1b7f4799f1d64d07ec7f34749504f2 100644 (file)
--- a/src/Network/Makefile.am
+++ b/src/Network/Makefile.am
@@ -17,11 +17,12 @@ libNetwork_a_SOURCES = \
        native.cxx native.hxx \
        native_ctrls.cxx native_ctrls.hxx \
        native_fdm.cxx native_fdm.hxx \
-       nmea.cxx nmea.hxx \
+       net_fdm.hxx \
+        nmea.cxx nmea.hxx \
         opengc.cxx opengc.hxx opengc_data.hxx \
        props.cxx props.hxx \
        pve.cxx pve.hxx \
-       raw_ctrls.hxx raw_fdm.hxx \
+       raw_ctrls.hxx \
        ray.cxx ray.hxx \
        rul.cxx rul.hxx