X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=FlightGear.dsp;h=1690f56e63c7e557dac71f302a4d57f5d71340a1;hb=1cdcaef13da5b7014c8514d3d6f2e8e4cc075c45;hp=e5e370e37dc7c0de69a743c2d7136e3801c26921;hpb=29d540901cd4212c24dc77811925d9eec36cdb9f;p=flightgear.git

diff --git a/FlightGear.dsp b/FlightGear.dsp
index e5e370e37..1690f56e6 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"
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # 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 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"
@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # 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 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 ""
@@ -679,6 +667,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"
@@ -829,7 +847,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"
 
@@ -844,7 +862,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"
 
@@ -859,7 +877,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"
 
@@ -874,7 +892,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"
 
@@ -889,7 +907,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"
 
@@ -904,7 +922,7 @@ SOURCE=.\src\FDM\JSBSim\FGFCS.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp
+SOURCE=.\src\FDM\JSBSim\FGForce.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -919,7 +937,7 @@ SOURCE=.\src\FDM\JSBSim\FGFDMExec.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\JSBSim\FGFDMExec.h
+SOURCE=.\src\FDM\JSBSim\FGForce.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -934,7 +952,7 @@ SOURCE=.\src\FDM\JSBSim\FGFDMExec.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\JSBSim\FGForce.cpp
+SOURCE=.\src\FDM\JSBSim\FGInertial.cpp
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -949,7 +967,7 @@ SOURCE=.\src\FDM\JSBSim\FGForce.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\src\FDM\JSBSim\FGForce.h
+SOURCE=.\src\FDM\JSBSim\FGInertial.h
 
 !IF  "$(CFG)" == "FlightGear - Win32 Release"
 
@@ -1024,6 +1042,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"
@@ -4418,35 +4466,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 
 
@@ -4472,7 +4520,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"
 
@@ -4487,7 +4535,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"
 
@@ -4652,36 +4700,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"
@@ -5332,115 +5350,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"
@@ -6042,40 +5951,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"