From 22aef83a8f998532531299d794811743993b188d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 9 Oct 2001 20:03:51 +0000 Subject: [PATCH] Updated MSVC Workspace files to fix build problems. --- VisualStudio/osg/osg.dsp | 50 ++++++++++++++++++++++++++++---- VisualStudio/osgGLUT/osgGLUT.dsp | 10 +++++-- VisualStudio/osgUtil/osgUtil.dsp | 22 ++++++++++---- include/osg/Statistics | 2 +- 4 files changed, 70 insertions(+), 14 deletions(-) diff --git a/VisualStudio/osg/osg.dsp b/VisualStudio/osg/osg.dsp index d2f31049c..c1d63c319 100755 --- a/VisualStudio/osg/osg.dsp +++ b/VisualStudio/osg/osg.dsp @@ -133,11 +133,19 @@ SOURCE=..\..\src\osg\Drawable.cpp # End Source File # Begin Source File +SOURCE=..\..\src\osg\EarthSky.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osg\Fog.cpp # End Source File # Begin Source File -SOURCE=..\..\Src\Osg\FrontFace.cpp +SOURCE=..\..\src\osg\FrameStamp.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\src\osg\FrontFace.cpp # End Source File # Begin Source File @@ -275,6 +283,10 @@ SOURCE=..\..\src\osg\Transparency.cpp SOURCE=..\..\src\osg\Version.cpp # End Source File +# Begin Source File + +SOURCE=..\..\src\osg\Viewport.cpp +# End Source File # End Group # Begin Group "Header Files" @@ -297,6 +309,10 @@ SOURCE=..\..\Include\Osg\BoundingSphere # End Source File # Begin Source File +SOURCE=..\..\include\osg\BoundsChecking +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Camera # End Source File # Begin Source File @@ -325,6 +341,10 @@ SOURCE=..\..\Include\Osg\Drawable # End Source File # Begin Source File +SOURCE=..\..\include\osg\EarthSky +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Export # End Source File # Begin Source File @@ -333,6 +353,10 @@ SOURCE=..\..\Include\Osg\Fog # End Source File # Begin Source File +SOURCE=..\..\include\osg\FrameStamp +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\FrontFace # End Source File # Begin Source File @@ -353,6 +377,10 @@ SOURCE=..\..\Include\Osg\GLExtensions # End Source File # Begin Source File +SOURCE=..\..\include\osg\Glu +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Group # End Source File # Begin Source File @@ -369,10 +397,6 @@ SOURCE=..\..\Include\Osg\ImpostorSprite # End Source File # Begin Source File -SOURCE=..\..\Include\Osg\Input -# End Source File -# Begin Source File - SOURCE=..\..\Include\Osg\Light # End Source File # Begin Source File @@ -393,6 +417,10 @@ SOURCE=..\..\Include\Osg\Material # End Source File # Begin Source File +SOURCE=..\..\include\osg\Math +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Matrix # End Source File # Begin Source File @@ -409,6 +437,10 @@ SOURCE=..\..\Include\Osg\Node # End Source File # Begin Source File +SOURCE=..\..\include\osg\NodeCallback +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\NodeVisitor # End Source File # Begin Source File @@ -461,6 +493,10 @@ SOURCE=..\..\Include\Osg\StateSet # End Source File # Begin Source File +SOURCE=..\..\include\osg\Statistics +# End Source File +# Begin Source File + SOURCE=..\..\Include\Osg\Stencil # End Source File # Begin Source File @@ -515,6 +551,10 @@ SOURCE=..\..\Include\Osg\Vec4 SOURCE=..\..\Include\Osg\Version # End Source File +# Begin Source File + +SOURCE=..\..\include\osg\Viewport +# End Source File # End Group # Begin Group "Resource Files" diff --git a/VisualStudio/osgGLUT/osgGLUT.dsp b/VisualStudio/osgGLUT/osgGLUT.dsp index 148ec8d40..8a6d1140f 100755 --- a/VisualStudio/osgGLUT/osgGLUT.dsp +++ b/VisualStudio/osgGLUT/osgGLUT.dsp @@ -93,15 +93,15 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\Src\osgGLUT\GLUTEventAdapter.cpp +SOURCE=..\..\src\osgGLUT\GLUTEventAdapter.cpp # End Source File # Begin Source File -SOURCE=..\..\Src\osgGLUT\Version.cpp +SOURCE=..\..\src\osgGLUT\Version.cpp # End Source File # Begin Source File -SOURCE=..\..\Src\osgGLUT\Viewer.cpp +SOURCE=..\..\src\osgGLUT\Viewer.cpp # End Source File # End Group # Begin Group "Header Files" @@ -113,6 +113,10 @@ SOURCE=..\..\Include\osgGLUT\Export # End Source File # Begin Source File +SOURCE=..\..\include\osgGLUT\glut +# End Source File +# Begin Source File + SOURCE=..\..\Include\osgGLUT\GLUTEventAdapter # End Source File # Begin Source File diff --git a/VisualStudio/osgUtil/osgUtil.dsp b/VisualStudio/osgUtil/osgUtil.dsp index 1eb0ec9be..eecfe9762 100755 --- a/VisualStudio/osgUtil/osgUtil.dsp +++ b/VisualStudio/osgUtil/osgUtil.dsp @@ -93,6 +93,10 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\src\osgUtil\AppVisitor.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgUtil\CameraManipulator.cpp # End Source File # Begin Source File @@ -133,6 +137,10 @@ SOURCE=..\..\src\osgUtil\NvTriStripObjects.cpp # End Source File # Begin Source File +SOURCE=..\..\src\osgUtil\OptimizeStateVisitor.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\osgUtil\RenderBin.cpp # End Source File # Begin Source File @@ -169,7 +177,7 @@ SOURCE=..\..\src\osgUtil\SmoothingVisitor.cpp # End Source File # Begin Source File -SOURCE=..\..\Src\osgUtil\StateSetManipulator.cpp +SOURCE=..\..\src\osgUtil\StateSetManipulator.cpp # End Source File # Begin Source File @@ -197,6 +205,10 @@ SOURCE=..\..\src\osgUtil\VisualsRequirementsVisitor.cpp # PROP Default_Filter ";h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=..\..\include\osgUtil\AppVisitor +# End Source File +# Begin Source File + SOURCE=..\..\Include\osgUtil\CameraManipulator # End Source File # Begin Source File @@ -253,6 +265,10 @@ SOURCE=..\..\src\osgUtil\NvTriStripObjects.h # End Source File # Begin Source File +SOURCE=..\..\include\osgUtil\OptimizeStateVisitor +# End Source File +# Begin Source File + SOURCE=..\..\include\osgUtil\RenderBin # End Source File # Begin Source File @@ -293,10 +309,6 @@ SOURCE=..\..\Include\osgUtil\StateSetManipulator # End Source File # Begin Source File -SOURCE=..\..\include\osgUtil\Statistics -# End Source File -# Begin Source File - SOURCE=..\..\include\osgUtil\Tesselator # End Source File # Begin Source File diff --git a/include/osg/Statistics b/include/osg/Statistics index 2799c716a..858cb7596 100644 --- a/include/osg/Statistics +++ b/include/osg/Statistics @@ -13,7 +13,7 @@ namespace osg { * Statistics base class. Used to extract primitive information from * the renderBin(s). */ -class SG_EXPORT Statistics : public Object +class /*SG_EXPORT*/ Statistics : public Object { public: