diff --git a/Doxyfile b/Doxyfile index 2de14cfd..f383a5a6 100644 --- a/Doxyfile +++ b/Doxyfile @@ -22,7 +22,7 @@ PROJECT_NAME = SimGear # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.3.8 +PROJECT_NUMBER = 0.3.9 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/Makefile.am b/Makefile.am index 9419c66f..302f4684 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = \ SUBDIRS = src-libs simgear dist-hook: - (cd $(top_srcdir); $(HOME)/Projects/FlightGear-0.9/admin/am2dsp.pl) + (cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl) # # Rule to build RPM distribution package diff --git a/NEWS b/NEWS index db142bda..5458e460 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,29 @@ +New in 0.3.9-pre1 +* November 5, 2005 + +* Add support for OpenAL 1.1 (with a seperate alut library.) +* Add support for volumetric shadows. Aircraft can cast shadows on themselves + as well as onto the ground (by Harold Johnson.) +* New 3d volumetric clouds by Harold Johnson (along with several rounds of + followup fixes and improvements.) +* Remove Mark Harris's old 3d clouds because they were never properly + integrated. And we now have new 3d clouds. +* Add support for seasonal textures (with a set of winter textures added + to FlightGear.) +* Create a metar abstraction layer with support for most of the metar codes. +* Updated Nasal scripting system. Adds several new syntax convenience + features, fixes parser bugs, fixes several internal bugs. +* Our 3d cockpit jitter problem is fixed (woohoo!) +* Add code to support rendering to a texture. +* Various low model level animation fixes and additions ... color, + transparancy, 'chrome' effects, randomized spin, etc. +* Create our own portable stdint.h implimentation. +* Fixed several memory leaks. +* RemoveChildren() fixes in the property system. +* Fix many cases of 'const'. +* Fixes for cygwin, solaris/sun, Mac OS X, MSVC, gcc-3.4.x. + + New in 0.3.8 * January 18, 2005 diff --git a/SimGear.dsp b/SimGear.dsp index 6794ce35..0e420bf7 100644 --- a/SimGear.dsp +++ b/SimGear.dsp @@ -587,6 +587,21 @@ SOURCE=.\simgear\environment\metar.cxx !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\environment\visual_enviro.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgenvironment" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgenvironment" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_sgmisc" @@ -763,21 +778,6 @@ SOURCE=.\simgear\nasal\data.h # End Source File # Begin Source File -SOURCE=.\simgear\nasal\debug.c - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgnasal" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgnasal" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\simgear\nasal\gc.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -940,6 +940,36 @@ SOURCE=.\simgear\nasal\vector.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\nasal\thread-posix.c + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgnasal" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgnasal" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\nasal\thread-win32.c + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgnasal" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgnasal" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_sgprops" @@ -1181,6 +1211,51 @@ SOURCE=.\simgear\scene\model\placement.cxx !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\scene\model\placementtrans.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmodel" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmodel" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\scene\model\shadowvolume.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmodel" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmodel" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\scene\model\shadanim.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmodel" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmodel" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_sgsky" @@ -1291,891 +1366,47 @@ SOURCE=.\simgear\scene\sky\stars.cxx !ENDIF # End Source File -# End Group -# Begin Group "Lib_sgclouds3d" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\scene\sky\clouds3d\vec3fv.cpp +SOURCE=.\simgear\scene\sky\bbcache.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\scene\sky\clouds3d\vec3fv.hpp +SOURCE=.\simgear\scene\sky\cloudfield.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\scene\sky\clouds3d\vec3f.hpp +SOURCE=.\simgear\scene\sky\newcloud.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\vec4f.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\vec2f.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat16fv.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat16fv.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat33.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat33impl.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat44.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\mat44impl.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\tri.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\tri.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\plane.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\plane.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\camera.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\camera.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\camutils.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\camutils.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\glut_shapes.c - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\glut_shapes.h - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\minmaxbox.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\minmaxbox.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyAABBTree.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyArchive.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyArchive.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyBoundingVolume.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyBVTree.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyBVTreeSplitter.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyCloud.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyCloud.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyCloudParticle.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyContext.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyContext.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyDynamicTextureManager.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyDynamicTextureManager.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyLight.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyLight.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyMaterial.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyMaterial.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyMinMaxBox.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyMinMaxBox.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderable.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstance.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstanceCloud.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstanceCloud.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstanceGeneric.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstanceGroup.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyRenderableInstanceGroup.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkySceneLoader.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkySceneManager.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkySceneManager.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkySingleton.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyTexture.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyTextureManager.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyTextureManager.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyTextureState.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyTextureState.hpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\scene\sky\clouds3d\SkyUtil.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF @@ -2295,21 +1526,6 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx # End Source File # Begin Source File -SOURCE=.\simgear\screen\GLBitmaps.h - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgscreen" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgscreen" - -!ENDIF - -# End Source File -# Begin Source File - SOURCE=.\simgear\screen\screen-dump.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -2355,6 +1571,36 @@ SOURCE=.\simgear\screen\extensions.cxx # End Source File # Begin Source File +SOURCE=.\simgear\screen\RenderTexture.cpp + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgscreen" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgscreen" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\screen\shader.cpp + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgscreen" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgscreen" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\screen\win32-printer.h !IF "$(CFG)" == "SimGear - Win32 Release" @@ -2578,40 +1824,6 @@ SOURCE=.\simgear\timing\timezone.cxx !ENDIF -# End Source File -# End Group -# Begin Group "Lib_sgxgl" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\simgear\xgl\xgl.c - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgxgl" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgxgl" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\simgear\xgl\xglUtils.c - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgxgl" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgxgl" - -!ENDIF - # End Source File # End Group # Begin Group "Lib_sgxml" diff --git a/configure.ac b/configure.ac index 8995695f..545b380f 100644 --- 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.8) +AM_INIT_AUTOMAKE(SimGear, 0.3.9-pre1) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution.