X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=FlightGear.dsp;h=fca80bec5bae2eba145a42b9c5518d621ac10126;hb=6a9051883c1e5c1b7534ba0c833ebe86c85425a9;hp=e31f80f9c952165204afb6747edd1763e24fd8c8;hpb=5c08cc8bf5c0839e7363bc843abd1e47ae11f0a0;p=flightgear.git

diff --git a/FlightGear.dsp b/FlightGear.dsp
index e31f80f9c..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"
@@ -2337,21 +2427,6 @@ SOURCE=.\src\FDM\LaRCsim\ls_sym.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\LaRCsim\ls_trim.c
-
-!IF  "$(CFG)" == "FlightGear - Win32 Release"
-
-# PROP Intermediate_Dir "Release\Lib_LaRCsim"
-
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
-
-# PROP Intermediate_Dir "Debug\Lib_LaRCsim"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\src\FDM\LaRCsim\ls_types.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
@@ -4433,35 +4508,35 @@ SOURCE=.\src\GUI\trackball.h
 
 # End Source File
 # End Group
-# Begin Group "Lib_Joystick"
+# Begin Group "Lib_Input"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\src\Joystick\joystick.cxx
+SOURCE=.\src\Input\input.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\Lib_Joystick"
+# PROP Intermediate_Dir "Release\Lib_Input"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\Lib_Joystick"
+# PROP Intermediate_Dir "Debug\Lib_Input"
 
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Joystick\joystick.hxx
+SOURCE=.\src\Input\input.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
-# PROP Intermediate_Dir "Release\Lib_Joystick"
+# PROP Intermediate_Dir "Release\Lib_Input"
 
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"
 
-# PROP Intermediate_Dir "Debug\Lib_Joystick"
+# PROP Intermediate_Dir "Debug\Lib_Input"
 
 !ENDIF 
 
@@ -4487,7 +4562,7 @@ SOURCE=.\src\Main\main.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\bfi.cxx
+SOURCE=.\src\Main\fg_commands.cxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -4502,7 +4577,7 @@ SOURCE=.\src\Main\bfi.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\Main\bfi.hxx
+SOURCE=.\src\Main\fg_commands.hxx
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -4667,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"