Changes for Cygwin build, sent in by Norman Vine.

src/Demos/hangglide/hat.cpp

@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _MSC_VER
 #include <Windows.h>
 #pragma warning( disable : 4244 )
 #endif

src/Demos/hangglide/sky.cpp

@@ -9,7 +9,7 @@
 
 #include <osgDB/ReadFile>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif

src/Demos/hangglide/tank.cpp

@@ -11,7 +11,7 @@
 
 #include <osgDB/ReadFile>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif

src/Demos/hangglide/trees.cpp

@@ -13,7 +13,7 @@
 
 #include "hat.h"
 
-#ifdef WIN32
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif

src/osg/Image.cpp

@@ -297,7 +297,7 @@ void Image::scaleImage(const int s,const int t,const int r)
     if (!newData)
     {
         // should we throw an exception???  Just return for time being.
-        notify(FATAL) << "Error Image::scaleImage() do not succeed : out of memory."<<std::endl;
+        notify(FATAL) << "Error Image::scaleImage() do not succeed : out of memory."<<newTotalSize<<std::endl;
         return;
     }
 

src/osgDB/FileUtils_Unix.cpp

@@ -24,14 +24,15 @@ char *PathDelimitor = ":";
 static const char *s_default_file_path = ".:";
 static const char *s_default_dso_path = "/usr/lib32/:/usr/local/lib32/";
 static char *s_filePath = ".:";
+#elif defined(__CYGWIN__)
+char *PathDelimitor = ":";
+static const char *s_default_file_path = ".:";
+static const char *s_default_dso_path = "/usr/bin/:/usr/local/bin/:";
+static char *s_filePath = ".:";
 #else
 char *PathDelimitor = ":";
 static const char *s_default_file_path = ".:";
-#if defined(__CYGWIN__)
 static const char *s_default_dso_path = "/usr/lib/:/usr/local/lib/:";
-#else
-static const char *s_default_dso_path = "/usr/lib/:/usr/local/lib/:";
-#endif // __CYGWIN__
 static char *s_filePath = ".:";
 #endif
 

src/osgPlugins/flt/Pool.cpp

@@ -1,6 +1,6 @@
 // Pool.cpp
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_MSC_VER)
     #pragma warning( disable : 4786 )
 #endif
 

src/osgPlugins/flt/ReaderWriterFLT.cpp

@@ -1,6 +1,6 @@
 // ReaderWriterFLT.cpp
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_MSC_VER)
 #pragma warning( disable : 4786 )
 #endif
 

src/osgText/FTGL.h

@@ -2,7 +2,7 @@
 #define		__FTGL__
 
 
-#ifdef WIN32
+#ifdef _MSC_VER
 	// stl stuff
 	#pragma warning( disable : 4244 )
 	#pragma warning( disable : 4251 )

src/osgText/Font.cpp

@@ -34,7 +34,7 @@ using namespace osgText;
 #if defined(__linux) || defined(__FreeBSD__) || defined (__sgi) || defined (__DARWIN_OSX__)
     static char* s_FontFilePath = ".:/usr/share/fonts/ttf:/usr/share/fonts/ttf/western:/usr/share/fonts/ttf/decoratives";
 #elif defined(WIN32)
-    static char* s_FontFilePath = ".;C:/windows/fonts";
+    static char* s_FontFilePath = ".;C:/winnt/fonts;C:/windows/fonts";
 #else
     static char* s_FontFilePath = ".:";
 #endif