diff --git a/FlightGear.dsp b/FlightGear.dsp index fca80bec5..712d757ef 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# 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 +# ADD CPP /nologo /W3 /GX /O2 /I ".\src" /I ".\src\include" /I "..\simgear" /I "..\simgear\simgear\metakit\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0xc09 /d "NDEBUG" # ADD RSC /l 0xc09 /d "NDEBUG" @@ -49,8 +49,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib opengl32.lib glu32.lib glut32.lib wsock32.lib ..SimGearDebugsimgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib ul.lib winmm.lib ..SimGearsimgearmetakituildsmk4vc60_d.lib /nologo /subsystem:console /machine:I386 +# 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 +# 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 /libpath:"..\plib" /libpath:"..\simgear" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# 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 +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\src" /I ".\src\include" /I "..\simgear" /I "..\simgear\simgear\metakit\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0xc09 /d "_DEBUG" # ADD RSC /l 0xc09 /d "_DEBUG" @@ -74,8 +74,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib opengl32.lib glu32.lib glut32.lib wsock32.lib ..SimGearDebugsimgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib ul.lib winmm.lib ..SimGearsimgearmetakituildsmk4vc60_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# 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 +# 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:"..\plib" /libpath:"..\simgear"" !ENDIF @@ -83,18 +83,6 @@ LINK32=link.exe # Name "FlightGear - Win32 Release" # Name "FlightGear - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group # Begin Group "Lib_Aircraft" # PROP Default_Filter "" @@ -5392,115 +5380,6 @@ SOURCE=.\src\Network\rul.hxx !ENDIF -# End Source File -# End Group -# Begin Group "Lib_NetworkOLK" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\src\NetworkOLK\net_send.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\net_hud.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\network.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\network.h - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\fgd.h - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\features.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\NetworkOLK\features.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" - -!ENDIF - # End Source File # End Group # Begin Group "Lib_Objects" @@ -6102,40 +5981,6 @@ SOURCE=.\src\Time\tmp.hxx !ENDIF -# End Source File -# End Group -# Begin Group "Lib_Weather" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\src\Weather\weather.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_Weather" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_Weather" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\Weather\weather.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_Weather" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_Weather" - -!ENDIF - # End Source File # End Group # Begin Group "Lib_WeatherCM" diff --git a/NEWS b/NEWS index ec5963aee..386eeb696 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ New in 0.7.7 -* June 22, 2001 (01/04/05) +* June 20, 2001 * Cleaned up various warning messages * Various Cygwin fixes. diff --git a/am2dsp.cfg b/am2dsp.cfg new file mode 100644 index 000000000..4f62a5a21 --- /dev/null +++ b/am2dsp.cfg @@ -0,0 +1,13 @@ +exclude_dir=NetworkOLK +exclude_dir=Weather + +#exclude_file = src/GUI/net_dlg.cxx +#exclude_file = src/GUI/net_dlg.hxx + +include_path = .\src +include_path = .\src\include +include_path = ..\simgear +include_path = ..\simgear\simgear\metakit\include + +lib_path = ..\plib +lib_path = ..\simgear