Fixed warning, and sorted entries in GNUmakefile

src/osg/GNUmakefile

@@ -6,64 +6,62 @@ CXXFILES =\
 	AnimationPath.cpp\
         ApplicationUsage.cpp\
         ArgumentParser.cpp\
-        AutoTransform.cpp\
 	Array.cpp\
+        AutoTransform.cpp\
 	Billboard.cpp\
+	BlendColor.cpp\
+	BlendEquation.cpp\
+	BlendFunc.cpp\
 	BoundingBox.cpp\
 	BoundingSphere.cpp\
 	BufferObject.cpp\
-	BlendColor.cpp\
-	BlendFunc.cpp\
-	BlendEquation.cpp\
+	ClearNode.cpp\
 	ClipNode.cpp\
 	ClipPlane.cpp\
+	ClusterCullingCallback.cpp\
+	CollectOccludersVisitor.cpp\
 	ColorMask.cpp\
 	ColorMatrix.cpp\
-	CollectOccludersVisitor.cpp\
-	ConvexPlanarPolygon.cpp\
 	ConvexPlanarOccluder.cpp\
+	ConvexPlanarPolygon.cpp\
 	CoordinateSystemNode.cpp\
 	CopyOp.cpp\
-	ClusterCullingCallback.cpp\
 	CullFace.cpp\
 	CullingSet.cpp\
-	CullStack.cpp\
 	CullSettings.cpp\
+	CullStack.cpp\
 	Depth.cpp\
 	DisplaySettings.cpp\
 	Drawable.cpp\
 	DrawPixels.cpp\
-	ClearNode.cpp\
+        dxtctool.cpp\
 	Fog.cpp\
 	FragmentProgram.cpp\
 	FrameStamp.cpp\
 	FrontFace.cpp\
-	GLExtensions.cpp\
 	Geode.cpp\
 	Geometry.cpp\
-	Program.cpp\
-	Uniform.cpp\
+	GLExtensions.cpp\
 	Group.cpp\
-        dxtctool.cpp\
 	Image.cpp\
 	ImageStream.cpp\
 	Impostor.cpp\
 	ImpostorSprite.cpp\
-	LOD.cpp\
-	LogicOp.cpp\
 	Light.cpp\
 	LightModel.cpp\
 	LightSource.cpp\
 	LineSegment.cpp\
 	LineStipple.cpp\
 	LineWidth.cpp\
+	LOD.cpp\
+	LogicOp.cpp\
 	Material.cpp\
-	Matrixf.cpp\
 	Matrixd.cpp\
+	Matrixf.cpp\
 	MatrixTransform.cpp\
 	Multisample.cpp\
-	Node.cpp\
 	NodeCallback.cpp\
+	Node.cpp\
 	NodeVisitor.cpp\
 	Notify.cpp\
 	Object.cpp\
@@ -76,13 +74,14 @@ CXXFILES =\
 	PolygonStipple.cpp\
 	PositionAttitudeTransform.cpp\
 	PrimitiveSet.cpp\
+	Program.cpp\
 	Projection.cpp\
 	ProxyNode.cpp\
 	Quat.cpp\
 	Referenced.cpp\
 	Sequence.cpp\
-	Shader.cpp\
 	ShadeModel.cpp\
+	Shader.cpp\
 	ShadowVolumeOccluder.cpp\
 	Shape.cpp\
 	ShapeDrawable.cpp\
@@ -90,23 +89,24 @@ CXXFILES =\
 	StateSet.cpp\
 	Stencil.cpp\
 	Switch.cpp\
-	TexEnv.cpp\
 	TexEnvCombine.cpp\
+	TexEnv.cpp\
 	TexEnvFilter.cpp\
 	TexGen.cpp\
 	TexGenNode.cpp\
 	TexMat.cpp\
-	Texture.cpp\
-	Texture2D.cpp\
 	Texture1D.cpp\
+	Texture2D.cpp\
 	Texture3D.cpp\
+	Texture.cpp\
 	TextureCubeMap.cpp\
 	TextureRectangle.cpp\
 	Timer.cpp\
 	Transform.cpp\
+	Uniform.cpp\
 	UnitTestFramework.cpp\
-	Version.cpp\
 	Vec3.cpp\
+	Version.cpp\
 	VertexProgram.cpp\
 	Viewport.cpp\
 

src/osg/Program.cpp

@@ -1992,7 +1992,7 @@ void Program::dirtyProgram()
 }
 
 
-void Program::releaseGLObjects(osg::State* state) const
+void Program::releaseGLObjects(osg::State* /*state*/) const
 {
     // TODO
 }
@@ -2108,7 +2108,7 @@ Program::ActiveUniform::ActiveUniform( const char* name, GLenum type, GLint loc
 {
 }
 
-void Program::ActiveUniform::applyData( const GL2Extensions* ext, GLuint prog )
+void Program::ActiveUniform::applyData( const GL2Extensions* ext, GLuint /*prog*/ )
 {
     switch( repType(getType()) )
     {