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

examples/osgcluster/broadcaster.cpp

@@ -2,7 +2,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#if !defined (WIN32)
+#if !defined (WIN32) || defined(__CYGWIN__)
 #include <sys/ioctl.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
@@ -26,7 +26,7 @@
     #include <unistd.h>
     #include <net/soioctl.h>
 #elif defined(__CYGWIN__) 
-    // nothing needed
+    #include <unistd.h>
 #elif defined(__sun) 
     #include <unistd.h>
     #include <sys/sockio.h>
@@ -56,7 +56,7 @@ Broadcaster::Broadcaster( void )
 
 Broadcaster::~Broadcaster( void )
 {
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     closesocket( _so);
 #else
     close( _so );
@@ -65,7 +65,7 @@ Broadcaster::~Broadcaster( void )
 
 bool Broadcaster::init( void )
 {
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     WORD version = MAKEWORD(1,1);
     WSADATA wsaData;
     // First, we start up Winsock
@@ -83,13 +83,13 @@ bool Broadcaster::init( void )
         perror( "Socket" );
         return false;
     }
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     const BOOL on = TRUE;
 #else
     int on = 1;
 #endif
 
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, (const char *) &on, sizeof(int));
 #else
     setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
@@ -99,16 +99,16 @@ bool Broadcaster::init( void )
     saddr.sin_port   = htons( _port );
     if( _address == 0 )
     {
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
         setsockopt( _so, SOL_SOCKET, SO_BROADCAST, (const char *) &on, sizeof(int));
 #else
         setsockopt( _so, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on));
 #endif
 
-#if !defined (WIN32)
+#if !defined (WIN32) || defined(__CYGWIN__)
         struct ifreq ifr;
 #endif
-#if defined (__linux)
+#if defined (__linux) || defined(__CYGWIN__)
         strcpy( ifr.ifr_name, "eth0" );
 #elif defined(__sun)
         strcpy( ifr.ifr_name, "hme0" );
@@ -174,7 +174,7 @@ void Broadcaster::sync( void )
 	return;
     }
 
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     unsigned int size = sizeof( SOCKADDR_IN );
     sendto( _so, (const char *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
     int err = WSAGetLastError ();

examples/osgcluster/broadcaster.h

@@ -7,7 +7,7 @@
 // Class definition for broadcasting a buffer to a LAN
 //
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(__CYGWIN__)
     #include <netinet/in.h>
 #endif
 
@@ -36,7 +36,7 @@ class Broadcaster
 	bool init( void );
 
     private :
-#if defined (WIN32)
+#if defined(WIN32) && !defined(__CYGWIN__)
         SOCKET _so;
 #else
         int _so;
@@ -45,7 +45,7 @@ class Broadcaster
         short _port;
         void *_buffer;
         unsigned int _buffer_size;
-#if defined (WIN32)
+#if defined(WIN32) && !defined(__CYGWIN__)
         SOCKADDR_IN saddr;
 #else
         struct sockaddr_in saddr;

examples/osgcluster/osgcluster.cpp

@@ -12,7 +12,7 @@
 
 #include <osg/Quat>
 
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
 #include <winsock.h>
 #endif
 

examples/osgcluster/receiver.cpp

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
 #include <winsock.h>
 #else
 #include <unistd.h>
@@ -26,7 +26,7 @@ Receiver::Receiver( void )
 
 Receiver::~Receiver( void )
 {
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     closesocket( _so);
 #else
     close( _so );
@@ -35,7 +35,7 @@ Receiver::~Receiver( void )
 
 bool Receiver::init( void )
 {
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
     WORD version = MAKEWORD(1,1);
     WSADATA wsaData;
     // First, we start up Winsock
@@ -53,7 +53,7 @@ bool Receiver::init( void )
         perror( "Socket" );
     return false;
     }
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
 //    const BOOL on = TRUE;
 //    setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, (const char*) &on, sizeof(int));
 #else
@@ -64,7 +64,7 @@ bool Receiver::init( void )
 //    struct sockaddr_in saddr;
     saddr.sin_family = AF_INET;
     saddr.sin_port   = htons( _port );
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
     saddr.sin_addr.s_addr =  htonl(INADDR_ANY);
 #else
     saddr.sin_addr.s_addr =  0;
@@ -117,7 +117,7 @@ void Receiver::sync( void )
     tv.tv_sec = 0;
     tv.tv_usec = 0;
 
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
 //    saddr.sin_port   = htons( _port );
     recvfrom( _so, (char *)_buffer, _buffer_size, 0, (sockaddr*)&saddr, &size );
 //    recvfrom(sock_Receive, szMessage, 256, 0, (sockaddr*)&addr_Cli, &clilen)

examples/osgcluster/receiver.h

@@ -8,7 +8,7 @@
 // Class definition for the recipient of a broadcasted message
 //
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(__CYGWIN__)
     #include <netinet/in.h>
 #endif
 
@@ -33,14 +33,11 @@ class Receiver
 	bool init( void );
 
     private :
-#if defined (WIN32)
+#if defined (WIN32) && !defined(__CYGWIN__)
         SOCKET _so;
-#else
-    int _so;
-#endif
-#if defined (WIN32)
         SOCKADDR_IN saddr;
 #else
+        int _so;
         struct sockaddr_in saddr;
 #endif
     bool _initialized;

examples/osgdem/GNUmakefile

@@ -4,15 +4,13 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgdem.cpp\
 
-ifneq ("$(GDAL_INCLUDES)","")
 INC += $(GDAL_INCLUDES)
-endif
 
-ifneq ("$(GDAL_LIB_DIR)","")
-LDFLAGS += -L$(GDAL_LIB_DIR)
-endif
+LIBS     += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgText -losgGA -losgDB -losgUtil -losg $(GDAL_LIBS) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
-LIBS     += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgText -losgGA -losgDB -losgUtil -losg -lgdal $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
+ifeq ($(OS),MINGW)
+LIBS	+= -ljpeg -lpng -lgeotiff -ltiff -lz -L/usr/mingw/lib/malloc.o
+endif
 
 INSTFILES = \
 	$(CXXFILES)\