Bernie Bright:

[simgear.git] / SimGear.dsp

diff --git a/SimGear.dsp b/SimGear.dsp
index 1aa6b91e41aa31576c0bd0d1cef712690bcd4cc6..67177fa2e4508d3c1a4c3a8aa7a2c6300d22924b 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -30,19 +30,12 @@ RSC=rc.exe
 \r
 !IF  "$(CFG)" == "SimGear - 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 "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /FD /c  /MT /I "." /I ".." /I ".\SimGear" /I ".\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
@@ -53,19 +46,12 @@ LINK32=link.exe -lib
 \r
 !ELSEIF  "$(CFG)" == "SimGear - 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 Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /GX /ZI /Od /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD CPP /nologo /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c  /MT /I "." /I ".." /I ".\SimGear" /I ".\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
@@ -80,18 +66,6 @@ LINK32=link.exe -lib
 \r
 # Name "SimGear - Win32 Release"\r
 # Name "SimGear - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
 # Begin Group "Lib_sgbucket"\r
 \r
 # PROP Default_Filter ""\r
@@ -421,6 +395,21 @@ SOURCE=.\simgear\io\sg_socket.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\io\sg_socket_udp.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgio"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgio"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgmagvar"\r
@@ -770,6 +759,36 @@ SOURCE=.\simgear\metar\Stspack3.cpp
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\misc\commands.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmisc"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmisc"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\misc\exception.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmisc"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmisc"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\misc\props.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -958,6 +977,21 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\screen\tr.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\screen\win32-printer.h\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1098,25 +1132,6 @@ SOURCE=.\simgear\sky\stars.cxx
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# End Group\r
-# Begin Group "Lib_sgthreads"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\threads\SGThread.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgthreads"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgthreads"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgtiming"\r
@@ -1476,354 +1491,32 @@ SOURCE=.\simgear\xml\xmltok_impl.h
 \r
 # End Source File\r
 # End Group\r
-# Begin Group "Lib_z"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\zlib\adler32.c\r
+SOURCE=.\simgear\simgear_config.h.vc5\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\simgear\simgear_config.h.vc5\r
 \r
-# End Source File\r
-# Begin Source File\r
+".\simgear\simgear_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+        copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\r
 \r
-SOURCE=.\simgear\zlib\compress.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
+# End Custom Build\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\crc32.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
+# Begin Custom Build - Creating config.h\r
+InputPath=.\simgear\simgear_config.h.vc5\r
 \r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+".\simgear\simgear_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+        copy .\simgear\simgear_config.h.vc5 .\simgear\simgear_config.h\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
+# End Custom Build\r
 \r
-!ENDIF \r
+!ENDIF\r
 \r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\deflate.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\deflate.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\gzio.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infblock.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infblock.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infcodes.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infcodes.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inffast.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inffast.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inffixed.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inflate.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inftrees.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\inftrees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infutil.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\infutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\trees.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\trees.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\uncompr.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\zutil.c\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\zlib\zutil.h\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_z"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_z"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# End Group\r
 # End Target\r
 # End Project\r