- Update SimGear.dsp

- Assign an arbitrary prerelease version number
- Fix a "make dist" problem.

diff --git a/SimGear.dsp b/SimGear.dsp
index 98b818e3b6dd47fcb0f754b882568aaf8093d8c7..5c21b11c08558cc8103af09574c75a5669c3cb11 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -496,7 +496,7 @@ SOURCE=.\simgear\math\leastsqs.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\math\polar3d.cxx\r
+SOURCE=.\simgear\math\sg_random.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -511,7 +511,7 @@ SOURCE=.\simgear\math\polar3d.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\math\sg_geodesy.cxx\r
+SOURCE=.\simgear\math\vector.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -526,7 +526,7 @@ SOURCE=.\simgear\math\sg_geodesy.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\math\sg_random.c\r
+SOURCE=.\simgear\math\SGGeod.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -541,7 +541,7 @@ SOURCE=.\simgear\math\sg_random.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\math\vector.cxx\r
+SOURCE=.\simgear\math\SGGeodesy.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -554,28 +554,28 @@ SOURCE=.\simgear\math\vector.cxx
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_sgenvironment"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\math\SGGeodesy.cxx\r
+SOURCE=.\simgear\environment\metar.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgmath"\r
+# PROP Intermediate_Dir "Release\Lib_sgenvironment"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgmath"\r
+# PROP Intermediate_Dir "Debug\Lib_sgenvironment"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_sgenvironment"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\environment\metar.cxx\r
+SOURCE=.\simgear\environment\visual_enviro.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -590,7 +590,7 @@ SOURCE=.\simgear\environment\metar.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\environment\visual_enviro.cxx\r
+SOURCE=.\simgear\environment\precipitation.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -711,6 +711,21 @@ SOURCE=.\simgear\misc\interpolator.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\misc\PathOptions.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
 # End Group\r
 # Begin Group "Lib_sgnasal"\r
@@ -718,6 +733,21 @@ SOURCE=.\simgear\misc\interpolator.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\nasal\bitslib.c\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgnasal"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgnasal"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\nasal\code.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -808,7 +838,7 @@ SOURCE=.\simgear\nasal\hash.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\lex.c\r
+SOURCE=.\simgear\nasal\iolib.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -823,7 +853,7 @@ SOURCE=.\simgear\nasal\lex.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\lib.c\r
+SOURCE=.\simgear\nasal\iolib.h\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -838,7 +868,7 @@ SOURCE=.\simgear\nasal\lib.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\mathlib.c\r
+SOURCE=.\simgear\nasal\lex.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -853,7 +883,7 @@ SOURCE=.\simgear\nasal\mathlib.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\iolib.c\r
+SOURCE=.\simgear\nasal\lib.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -868,7 +898,7 @@ SOURCE=.\simgear\nasal\iolib.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\iolib.h\r
+SOURCE=.\simgear\nasal\mathlib.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -883,7 +913,7 @@ SOURCE=.\simgear\nasal\iolib.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\bitslib.c\r
+SOURCE=.\simgear\nasal\misc.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -898,7 +928,7 @@ SOURCE=.\simgear\nasal\bitslib.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\misc.c\r
+SOURCE=.\simgear\nasal\naref.h\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -973,7 +1003,7 @@ SOURCE=.\simgear\nasal\string.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\vector.c\r
+SOURCE=.\simgear\nasal\thread-posix.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -988,7 +1018,7 @@ SOURCE=.\simgear\nasal\vector.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\thread-posix.c\r
+SOURCE=.\simgear\nasal\thread-win32.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1003,7 +1033,37 @@ SOURCE=.\simgear\nasal\thread-posix.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\nasal\thread-win32.c\r
+SOURCE=.\simgear\nasal\threadlib.c\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgnasal"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgnasal"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\nasal\utf8lib.c\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgnasal"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgnasal"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\nasal\vector.c\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1169,7 +1229,7 @@ SOURCE=.\simgear\scene\model\animation.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\location.cxx\r
+SOURCE=.\simgear\scene\model\particles.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1184,7 +1244,7 @@ SOURCE=.\simgear\scene\model\location.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\model.cxx\r
+SOURCE=.\simgear\scene\model\location.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1199,7 +1259,7 @@ SOURCE=.\simgear\scene\model\model.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\modellib.cxx\r
+SOURCE=.\simgear\scene\model\model.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1214,7 +1274,7 @@ SOURCE=.\simgear\scene\model\modellib.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\persparam.cxx\r
+SOURCE=.\simgear\scene\model\modellib.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1229,7 +1289,7 @@ SOURCE=.\simgear\scene\model\persparam.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\placement.cxx\r
+SOURCE=.\simgear\scene\model\ModelRegistry.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1244,7 +1304,7 @@ SOURCE=.\simgear\scene\model\placement.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\placementtrans.cxx\r
+SOURCE=.\simgear\scene\model\persparam.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1259,7 +1319,7 @@ SOURCE=.\simgear\scene\model\placementtrans.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\shadanim.cxx\r
+SOURCE=.\simgear\scene\model\placement.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1274,7 +1334,7 @@ SOURCE=.\simgear\scene\model\shadanim.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\model\SGMaterialAnimation.cxx\r
+SOURCE=.\simgear\scene\model\placementtrans.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -1287,359 +1347,764 @@ SOURCE=.\simgear\scene\model\SGMaterialAnimation.cxx
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_sgsky"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\cloud.cxx\r
+SOURCE=.\simgear\scene\model\shadanim.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\dome.cxx\r
+SOURCE=.\simgear\scene\model\CheckSceneryVisitor.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\moon.cxx\r
+SOURCE=.\simgear\scene\model\SGClipGroup.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\oursun.cxx\r
+SOURCE=.\simgear\scene\model\SGMaterialAnimation.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\sky.cxx\r
+SOURCE=.\simgear\scene\model\SGOffsetTransform.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\sphere.cxx\r
+SOURCE=.\simgear\scene\model\SGPagedLOD.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\stars.cxx\r
+SOURCE=.\simgear\scene\model\SGReaderWriterXML.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\bbcache.cxx\r
+SOURCE=.\simgear\scene\model\SGRotateTransform.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\cloudfield.cxx\r
+SOURCE=.\simgear\scene\model\SGScaleTransform.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\sky\newcloud.cxx\r
+SOURCE=.\simgear\scene\model\SGTranslateTransform.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgsky"\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # End Group\r
-# Begin Group "Lib_sgtgdb"\r
+# Begin Group "Lib_sgsky"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\tgdb\apt_signs.cxx\r
+SOURCE=.\simgear\scene\sky\cloud.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\tgdb\leaf.cxx\r
+SOURCE=.\simgear\scene\sky\dome.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\tgdb\obj.cxx\r
+SOURCE=.\simgear\scene\sky\moon.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\tgdb\pt_lights.cxx\r
+SOURCE=.\simgear\scene\sky\oursun.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\tgdb\userdata.cxx\r
+SOURCE=.\simgear\scene\sky\sky.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_sgutil"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\util\SGStateAttributeVisitor.cxx\r
+SOURCE=.\simgear\scene\sky\sphere.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\scene\util\SGTextureStateAttributeVisitor.cxx\r
+SOURCE=.\simgear\scene\sky\stars.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
-# End Group\r
-# Begin Group "Lib_sgscreen"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\texture.cxx\r
+SOURCE=.\simgear\scene\sky\bbcache.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\GLBitmaps.cxx\r
+SOURCE=.\simgear\scene\sky\cloudfield.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\screen-dump.cxx\r
+SOURCE=.\simgear\scene\sky\newcloud.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgsky"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Debug\Lib_sgsky"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
+# End Group\r
+# Begin Group "Lib_sgtgdb"\r
+\r
+# PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\tr.cxx\r
+SOURCE=.\simgear\scene\tgdb\apt_signs.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\extensions.cxx\r
+SOURCE=.\simgear\scene\tgdb\obj.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
-# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
 \r
 !ENDIF \r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\screen\RenderTexture.cpp\r
+SOURCE=.\simgear\scene\tgdb\pt_lights.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
-# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\userdata.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\ReaderWriterSTG.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\SGOceanTile.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\SGReaderWriterBTG.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\SGReaderWriterBTG.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\SGVasiDrawable.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\GroundLightManager.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\SGModelBin.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\ShaderGeometry.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\TileCache.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\TileEntry.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\TreeBin.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\tgdb\TreeBin.hxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgtgdb"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgtgdb"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_sgutil"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\SGEnlargeBoundingBox.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\SGSceneFeatures.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\SGSceneUserData.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\SGStateAttributeVisitor.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\SGTextureStateAttributeVisitor.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\NodeAndDrawableVisitor.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\StateAttributeFactory.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\scene\util\QuadTreeBuilder.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgutil"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgutil"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_sgscreen"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\screen\texture.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\GLBitmaps.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\screen-dump.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\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\extensions.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\RenderTexture.cpp\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
 \r
 !ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
 \r
@@ -1839,6 +2304,51 @@ SOURCE=.\simgear\structure\SGBinding.cxx
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\structure\SGExpression.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgstructure"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgstructure"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\structure\SGSmplhist.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgstructure"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgstructure"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\structure\SGSmplstat.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgstructure"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgstructure"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgtiming"\r

diff --git a/configure.ac b/configure.ac
index 7b1e4ceebaf53cdbfbbe6413f6687b55f1f3d698..5b7259c4abfa88fbcb36503a8cba391fbe063b83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.3.10)
+AM_INIT_AUTOMAKE(SimGear, 1.99.4)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.

diff --git a/simgear/scene/tgdb/Makefile.am b/simgear/scene/tgdb/Makefile.am
index 0600f3d1f336867af3457dfd6269699eb346c0d8..e50fd34523a6d6ded72e937cc593e02960ffe503 100644 (file)
--- a/simgear/scene/tgdb/Makefile.am
+++ b/simgear/scene/tgdb/Makefile.am
@@ -31,12 +31,13 @@ libsgtgdb_a_SOURCES = \
        userdata.cxx \
        ReaderWriterSTG.cxx \
        SGOceanTile.cxx \
-       SGReaderWriterBTG.cxx \
+       SGReaderWriterBTG.cxx SGReaderWriterBTG.hxx \
        SGVasiDrawable.cxx \
        GroundLightManager.cxx \
+       SGModelBin.hxx \
        ShaderGeometry.cxx \
        TileCache.cxx \
        TileEntry.cxx \
-       TreeBin.cxx
+       TreeBin.cxx TreeBin.hxx
 
 INCLUDES = -I$(top_srcdir)