diff --git a/FlightGear.dsp b/FlightGear.dsp index 28694d079..a2ad297dd 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -41,7 +41,7 @@ RSC=rc.exe BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe -# 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 +# 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 !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" @@ -56,7 +56,7 @@ LINK32=link.exe BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe -# 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" +# 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" !ENDIF @@ -1297,36 +1297,6 @@ SOURCE=.\src\FDM\JSBSim\FGMassBalance.h # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGMatrix.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\FGMatrix.h - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_JSBSim" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_JSBSim" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\FDM\JSBSim\FGMatrix33.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -1627,6 +1597,36 @@ SOURCE=.\src\FDM\JSBSim\FGRocket.h # End Source File # Begin Source File +SOURCE=.\src\FDM\JSBSim\FGScript.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\FGScript.h + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_JSBSim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_JSBSim" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\FDM\JSBSim\FGState.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -4580,6 +4580,21 @@ SOURCE=.\src\FDM\YASim\Wing.cpp !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\src\FDM\YASim\SimpleJet.cpp + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_YASim" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_YASim" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_Flight" @@ -5732,6 +5747,36 @@ SOURCE=.\src\Network\protocol.hxx # End Source File # Begin Source File +SOURCE=.\src\Network\atc610x.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Network" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Network" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Network\atc610x.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Network" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Network" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\Network\atlas.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5942,6 +5987,21 @@ SOURCE=.\src\Network\native_fdm.hxx # End Source File # Begin Source File +SOURCE=.\src\Network\net_fdm.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Network" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Network" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\Network\nmea.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6092,21 +6152,6 @@ SOURCE=.\src\Network\raw_ctrls.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\raw_fdm.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_Network" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_Network" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\Network\ray.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" diff --git a/am2dsp.cfg b/am2dsp.cfg index a1c425a4d..646732870 100644 --- 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 9e9a34708..30ae5c9d2 100644 --- 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 234316805..7766c0977 100644 --- 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