X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=FlightGear.dsp;h=1415e88fc128a2846ba469981980e2d6ac629d55;hb=bc20e9b4905cb1464316417fe29d611511d3a364;hp=fca80bec5bae2eba145a42b9c5518d621ac10126;hpb=ca1a9cf7bdd729cbdf92c981b3bdd58c9da576b9;p=flightgear.git diff --git a/FlightGear.dsp b/FlightGear.dsp index fca80bec5..1415e88fc 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -30,52 +30,33 @@ RSC=rc.exe !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # 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 /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 # SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc09 /d "NDEBUG" # ADD RSC /l 0xc09 /d "NDEBUG" 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 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 !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # 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 -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc09 /d "_DEBUG" +# 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" # ADD RSC /l 0xc09 /d "_DEBUG" 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 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" !ENDIF @@ -83,18 +64,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 "" @@ -859,7 +828,7 @@ SOURCE=.\src\FDM\JSBSim\FGConfigFile.h # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGControls.cpp +SOURCE=.\src\FDM\JSBSim\FGDefs.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -874,7 +843,7 @@ SOURCE=.\src\FDM\JSBSim\FGControls.cpp # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGControls.h +SOURCE=.\src\FDM\JSBSim\FGFCS.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -889,7 +858,7 @@ SOURCE=.\src\FDM\JSBSim\FGControls.h # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGDefs.h +SOURCE=.\src\FDM\JSBSim\FGFCS.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -904,7 +873,7 @@ SOURCE=.\src\FDM\JSBSim\FGDefs.h # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGFCS.cpp +SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -919,7 +888,7 @@ SOURCE=.\src\FDM\JSBSim\FGFCS.cpp # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGFCS.h +SOURCE=.\src\FDM\JSBSim\FGFDMExec.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -934,7 +903,7 @@ SOURCE=.\src\FDM\JSBSim\FGFCS.h # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp +SOURCE=.\src\FDM\JSBSim\FGFactorGroup.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -949,7 +918,7 @@ SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp # End Source File # Begin Source File -SOURCE=.\src\FDM\JSBSim\FGFDMExec.h +SOURCE=.\src\FDM\JSBSim\FGFactorGroup.h !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -3196,6 +3165,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_engine.h # End Source File # Begin Source File +SOURCE=.\src\FDM\UIUCModel\uiuc_fog.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_fog.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_gear.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -3526,6 +3525,36 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_map_engine.h # End Source File # Begin Source File +SOURCE=.\src\FDM\UIUCModel\uiuc_map_fog.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_map_fog.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_map_geometry.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -4419,36 +4448,6 @@ SOURCE=.\src\GUI\mouse.cxx # End Source File # Begin Source File -SOURCE=.\src\GUI\net_dlg.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_GUI" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_GUI" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\GUI\net_dlg.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_GUI" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_GUI" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\GUI\sgVec3Slider.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5185,7 +5184,7 @@ SOURCE=.\src\Network\garmin.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\joyclient.cxx +SOURCE=.\src\Network\httpd.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5200,7 +5199,7 @@ SOURCE=.\src\Network\joyclient.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\joyclient.hxx +SOURCE=.\src\Network\httpd.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5215,7 +5214,7 @@ SOURCE=.\src\Network\joyclient.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\native.cxx +SOURCE=.\src\Network\joyclient.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5230,7 +5229,7 @@ SOURCE=.\src\Network\native.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\native.hxx +SOURCE=.\src\Network\joyclient.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5245,7 +5244,7 @@ SOURCE=.\src\Network\native.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\nmea.cxx +SOURCE=.\src\Network\native.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5260,7 +5259,7 @@ SOURCE=.\src\Network\nmea.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\nmea.hxx +SOURCE=.\src\Network\native.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5275,7 +5274,7 @@ SOURCE=.\src\Network\nmea.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\props.cxx +SOURCE=.\src\Network\native_ctrls.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5290,7 +5289,7 @@ SOURCE=.\src\Network\props.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\props.hxx +SOURCE=.\src\Network\native_ctrls.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5305,7 +5304,7 @@ SOURCE=.\src\Network\props.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\pve.cxx +SOURCE=.\src\Network\native_fdm.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5320,7 +5319,7 @@ SOURCE=.\src\Network\pve.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\pve.hxx +SOURCE=.\src\Network\native_fdm.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5335,7 +5334,7 @@ SOURCE=.\src\Network\pve.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\ray.cxx +SOURCE=.\src\Network\nmea.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5350,7 +5349,7 @@ SOURCE=.\src\Network\ray.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\ray.hxx +SOURCE=.\src\Network\nmea.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5365,7 +5364,7 @@ SOURCE=.\src\Network\ray.hxx # End Source File # Begin Source File -SOURCE=.\src\Network\rul.cxx +SOURCE=.\src\Network\props.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5380,7 +5379,7 @@ SOURCE=.\src\Network\rul.cxx # End Source File # Begin Source File -SOURCE=.\src\Network\rul.hxx +SOURCE=.\src\Network\props.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -5393,111 +5392,122 @@ SOURCE=.\src\Network\rul.hxx !ENDIF # End Source File -# End Group -# Begin Group "Lib_NetworkOLK" +# Begin Source File -# PROP Default_Filter "" +SOURCE=.\src\Network\pve.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\NetworkOLK\net_send.cxx +SOURCE=.\src\Network\pve.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\net_hud.cxx +SOURCE=.\src\Network\raw_ctrls.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\network.cxx +SOURCE=.\src\Network\raw_fdm.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\network.h +SOURCE=.\src\Network\ray.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\fgd.h +SOURCE=.\src\Network\ray.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\features.cxx +SOURCE=.\src\Network\rul.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF # End Source File # Begin Source File -SOURCE=.\src\NetworkOLK\features.hxx +SOURCE=.\src\Network\rul.hxx !IF "$(CFG)" == "FlightGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_NetworkOLK" +# PROP Intermediate_Dir "Release\Lib_Network" !ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_NetworkOLK" +# PROP Intermediate_Dir "Debug\Lib_Network" !ENDIF @@ -5508,6 +5518,36 @@ SOURCE=.\src\NetworkOLK\features.hxx # PROP Default_Filter "" # Begin Source File +SOURCE=.\src\Objects\apt_signs.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Objects" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Objects" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\src\Objects\apt_signs.hxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Objects" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Objects" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\Objects\newmat.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -6102,40 +6142,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" @@ -6562,5 +6568,33 @@ SOURCE=.\src\WeatherCM\FGWindItem.h # End Source File # End Group + +# Begin Source File + +SOURCE = .\src\Include\config.h-msvc6 + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# Begin Custom Build - Creating config.h +InputPath=.\src\Include\config.h-msvc6 + +".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\src\Include\config.h-msvc6 .\src\Include\config.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# Begin Custom Build - Creating config.h +InputPath=.\src\Include\config.h-msvc6 + +".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy .\src\Include\config.h-msvc6 .\src\Include\config.h + +# End Custom Build + +!ENDIF + +# End Source File # End Target # End Project