From Thom DeCarlo, build fixes for Cygwin.

This commit is contained in:
Robert Osfield
2005-05-17 09:06:12 +00:00
parent 883c530c09
commit cc7bb579b0
2 changed files with 3 additions and 2 deletions

View File

@@ -538,6 +538,7 @@ ifeq ($(OS),CYGWIN)
C++ = c++
DEPARG = -M -DWIN32
INC +=
LIB =
DEF += -DWIN32 -W -Wall -DNOMINMAX
OPTF = -O2
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
@@ -558,7 +559,7 @@ ifeq ($(OS),CYGWIN)
SOCKET_LIBS =
OTHER_LIBS = -lOpenThreads
PNG_LIBS = -lpng -lz
JPEG_LIBS = -ljpeg
JPEG_LIBS = -L/usr/local/lib -ljpeg
GIF_LIBS = -lungif
TIFF_LIB = -ltiff -lz -ljpeg

View File

@@ -64,7 +64,7 @@
#include <sstream>
#include <string>
#if (defined(__APPLE__)&&(__GNUC__<4)) || defined(WIN32) || defined (__sgi) || defined (__hpux)
#if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || defined (__sgi) || defined (__hpux)
typedef int socklen_t;
#endif