diff --git a/FlightGear.dsp b/FlightGear.dsp index 0bf3b8210..fca80bec5 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -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 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 +# 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 !ELSEIF "$(CFG)" == "FlightGear - Win32 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 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:"\lib" /libpath:"\lib\simgear" /libpath:"\lib\plib" +# 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 !ENDIF @@ -679,6 +679,36 @@ SOURCE=.\src\FDM\Balloon\BalloonSim.h # PROP Default_Filter "" # Begin Source File +SOURCE=.\src\FDM\JSBSim\FGAerodynamics.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\FGAerodynamics.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\FGAircraft.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -964,6 +994,36 @@ SOURCE=.\src\FDM\JSBSim\FGForce.h # End Source File # Begin Source File +SOURCE=.\src\FDM\JSBSim\FGInertial.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\FGInertial.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\FGInitialCondition.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -1024,6 +1084,36 @@ SOURCE=.\src\FDM\JSBSim\FGLGear.h # End Source File # Begin Source File +SOURCE=.\src\FDM\JSBSim\FGMassBalance.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\FGMassBalance.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\FGMatrix.cpp !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -4472,36 +4562,6 @@ SOURCE=.\src\Main\main.cxx # End Source File # Begin Source File -SOURCE=.\src\Main\bfi.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\main" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\main" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\Main\bfi.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\main" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\main" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\Main\fg_commands.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" @@ -4682,36 +4742,6 @@ SOURCE=.\src\Main\globals.hxx # End Source File # Begin Source File -SOURCE=.\src\Main\keyboard.cxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\main" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\main" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\src\Main\keyboard.hxx - -!IF "$(CFG)" == "FlightGear - Win32 Release" - -# PROP Intermediate_Dir "Release\main" - -!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\main" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\src\Main\options.cxx !IF "$(CFG)" == "FlightGear - Win32 Release"