Prepairing for 0.7.8 release.

[flightgear.git] / FlightGear.dsp

diff --git a/FlightGear.dsp b/FlightGear.dsp
index 88b3a299977b95b8944dd52063555e17498c948a..797d83c646054576313b7c2e77c95922e2bfad30 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -30,52 +30,33 @@ RSC=rc.exe
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# 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\r
+# 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\r
 # SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0xc09 /d "NDEBUG"\r
 # ADD RSC /l 0xc09 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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\r
-# 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"\r
+# 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\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# 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\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0xc09 /d "_DEBUG"\r
+# 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"\r
 # ADD RSC /l 0xc09 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# 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\r
-# 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""\r
+# 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"\r
 \r
 !ENDIF \r
 \r
@@ -847,36 +828,6 @@ SOURCE=.\src\FDM\JSBSim\FGConfigFile.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\FDM\JSBSim\FGControls.cpp\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\src\FDM\JSBSim\FGControls.h\r
-\r
-!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_JSBSim"\r
-\r
-!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_JSBSim"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\src\FDM\JSBSim\FGDefs.h\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
@@ -4412,10 +4363,12 @@ SOURCE=.\src\GUI\net_dlg.cxx
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
 # PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
 # PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Exclude_From_Build 1\r
 \r
 !ENDIF \r
 \r
@@ -4427,10 +4380,12 @@ SOURCE=.\src\GUI\net_dlg.hxx
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
 # PROP Intermediate_Dir "Release\Lib_GUI"\r
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
 # PROP Intermediate_Dir "Debug\Lib_GUI"\r
+# PROP Exclude_From_Build 1\r
 \r
 !ENDIF \r
 \r
@@ -5173,7 +5128,7 @@ SOURCE=.\src\Network\garmin.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\httpd.cxx\r
+SOURCE=.\src\Network\joyclient.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5188,7 +5143,7 @@ SOURCE=.\src\Network\httpd.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\httpd.hxx\r
+SOURCE=.\src\Network\joyclient.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5203,7 +5158,7 @@ SOURCE=.\src\Network\httpd.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\joyclient.cxx\r
+SOURCE=.\src\Network\native.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5218,7 +5173,7 @@ SOURCE=.\src\Network\joyclient.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\joyclient.hxx\r
+SOURCE=.\src\Network\native.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5233,7 +5188,7 @@ SOURCE=.\src\Network\joyclient.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\native.cxx\r
+SOURCE=.\src\Network\nmea.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5248,7 +5203,7 @@ SOURCE=.\src\Network\native.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\native.hxx\r
+SOURCE=.\src\Network\nmea.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5263,7 +5218,7 @@ SOURCE=.\src\Network\native.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.cxx\r
+SOURCE=.\src\Network\props.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5278,7 +5233,7 @@ SOURCE=.\src\Network\nmea.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\nmea.hxx\r
+SOURCE=.\src\Network\props.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5293,7 +5248,7 @@ SOURCE=.\src\Network\nmea.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.cxx\r
+SOURCE=.\src\Network\pve.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5308,7 +5263,7 @@ SOURCE=.\src\Network\props.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\props.hxx\r
+SOURCE=.\src\Network\pve.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5323,7 +5278,7 @@ SOURCE=.\src\Network\props.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.cxx\r
+SOURCE=.\src\Network\ray.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5338,7 +5293,7 @@ SOURCE=.\src\Network\pve.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\pve.hxx\r
+SOURCE=.\src\Network\ray.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5353,7 +5308,7 @@ SOURCE=.\src\Network\pve.hxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\ray.cxx\r
+SOURCE=.\src\Network\rul.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5368,7 +5323,7 @@ SOURCE=.\src\Network\ray.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\ray.hxx\r
+SOURCE=.\src\Network\rul.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
@@ -5381,40 +5336,40 @@ SOURCE=.\src\Network\ray.hxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_Objects"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\rul.cxx\r
+SOURCE=.\src\Objects\apt_signs.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Network"\r
+# PROP Intermediate_Dir "Release\Lib_Objects"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Network"\r
+# PROP Intermediate_Dir "Debug\Lib_Objects"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\src\Network\rul.hxx\r
+SOURCE=.\src\Objects\apt_signs.hxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_Network"\r
+# PROP Intermediate_Dir "Release\Lib_Objects"\r
 \r
 !ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_Network"\r
+# PROP Intermediate_Dir "Debug\Lib_Objects"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_Objects"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
 SOURCE=.\src\Objects\newmat.cxx\r
@@ -6437,5 +6392,33 @@ SOURCE=.\src\WeatherCM\FGWindItem.h
 \r
 # End Source File\r
 # End Group\r
+\r
+# Begin Source File\r
+\r
+SOURCE = .\src\Include\config.h-msvc6\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\src\Include\config.h-msvc6\r
+\r
+".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\src\Include\config.h-msvc6\r
+\r
+".\src\Include\config.h": $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy .\src\Include\config.h-msvc6 .\src\Include\config.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
 # End Target\r
 # End Project\r