From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin

src/osgPlugins/directx/directx.h

@@ -24,12 +24,12 @@
 #ifndef _DIRECTX_H_
 #define _DIRECTX_H_
 
-#include <osg/Math>
-
 #include <string>
 #include <vector>
 #include <fstream>
 
+#include <osg/Math>
+
 namespace DX {
 
     /*

src/osgPlugins/gdal/GNUmakefile

@@ -4,15 +4,10 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
         ReaderWriterGDAL.cpp\
 
-ifneq ("$(GDAL_INCLUDES)","")
+
 INC += $(GDAL_INCLUDES)
-endif
 
-ifneq ("$(GDAL_LIB_DIR)","")
-LDFLAGS += -L$(GDAL_LIB_DIR)
-endif
-
-LIBS  += $(OSG_LIBS) -lgdal $(OTHER_LIBS)
+LIBS  += $(OSG_LIBS) $(GDAL_LIBS) $(OTHER_LIBS)
 
 TARGET_BASENAME = gdal
 

src/osgPlugins/obj/glm.cpp

@@ -8,13 +8,13 @@
 
 
 /* includes */
+#include "glm.h"
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <osg/Math>
 #include <stdlib.h>
-#include "glm.h"
 
 #include <osg/Math>
 

src/osgPlugins/txp/trpage_sys.h

@@ -37,10 +37,12 @@
 
 #include <windows.h>
 
+#ifdef __MSC_VER
 // Microsoft Developer warnings that annoy me
 #pragma warning ( disable : 4251)
 #pragma warning ( disable : 4275)
 #pragma warning ( disable : 4786)
+#endif
 
 // Somewhat system independent file deletion macro
 #define TRPGDELETEFILE(file) DeleteFile((file))

src/osgProducer/KeyboardMouseCallback.cpp

@@ -1,8 +1,8 @@
+#include <osgProducer/KeyboardMouseCallback>
+
 #include <osg/Math>
 #include <osg/Notify>
 
-#include <osgProducer/KeyboardMouseCallback>
-
 #include <float.h>
 
 using namespace osgProducer;

src/osgTerrain/GNUmakefile

@@ -8,17 +8,11 @@ CXXFILES = \
     HeightFieldRenderer.cpp\
     Version.cpp\
 
-ifneq ("$(GDAL_INCLUDES)","")
-INC += $(GDAL_INCLUDES)
-endif
-
-ifneq ("$(GDAL_LIB_DIR)","")
-LDFLAGS += -L$(GDAL_LIB_DIR)
-endif
-
 DEF     += -DOSGTERRAIN_LIBRARY
 
-LIBS  +=  -losgDB -losgUtil -losg -lgdal $(GL_LIBS) $(OTHER_LIBS)
+INC += $(GDAL_INCLUDES)
+
+LIBS  +=  -losgDB -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(OTHER_LIBS)
 
 TARGET_BASENAME = osgTerrain
 LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

src/osgText/DefaultFont.h

@@ -14,12 +14,12 @@
 #ifndef NEWTEXT_DEFAULTFONT_H
 #define NEWTEXT_DEFAULTFONT_H 1
 
+#include <map>
+
 #include <osg/ref_ptr>
 
 #include <osgText/Font>
 
-#include <map>
-
 namespace osgText {
 
 class DefaultFont : public Font

src/osgText/String.cpp

@@ -1,7 +1,7 @@
 #include <osgText/String>
 
-#include <osg/Math>
 #include <osg/Notify>
+#include <osg/Math>
 
 using namespace osgText;
 

src/osgText/Text.cpp

@@ -12,11 +12,13 @@
 */
 
 
-#include <osg/GL>
+#include <vector>
+#include <osgText/Text>
+
 #include <osg/Math>
+#include <osg/GL>
 #include <osgUtil/CullVisitor>
 #include <osgDB/ReadFile>
-#include <osgText/Text>
 
 #include "DefaultFont.h"
 

src/osgUtil/SmoothingVisitor.cpp

@@ -86,6 +86,15 @@ struct SmoothTriangleFunctor
     }
 };
 
+SmoothingVisitor::SmoothingVisitor()
+{
+    setTraversalMode(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN);
+}
+
+SmoothingVisitor::~SmoothingVisitor()
+{
+}
+
 void SmoothingVisitor::smooth(osg::Geometry& geom)
 {
     Geometry::PrimitiveSetList& primitives = geom.getPrimitiveSetList();