From b66205f6535448252877bdcf0ec1e634c0d7ce5f Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Thu, 28 Mar 2002 06:35:57 +0000
Subject: [PATCH] Added Norman Vines fixeds for cygwin

---
 Make/makedefs.new | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Make/makedefs.new b/Make/makedefs.new
index 98388e87a..9f748f6dc 100644
--- a/Make/makedefs.new
+++ b/Make/makedefs.new
@@ -164,9 +164,9 @@ ifeq ($(OS),MacOSX)
 endif
 
 #### Cygwin/Mingw specific definitions
-ifeq ($(OS),Cygwin)
-  C++               = g++
-  DEPARG            = -MM
+ifeq ($(OS),CYGWIN_NT-5.0)
+  C++               = c++
+  DEPARG            = -M
   INC               += 
   DEF               += -DWIN32 -W -Wall
   OPTF              = -O2 
@@ -177,12 +177,12 @@ ifeq ($(OS),Cygwin)
 		      -Wl,--out-implib,$(TOPDIR)/lib/lib$$TARGET_BASENAME.a \
 
   ARCHARGS          = 
-  LINKARGS          = -L/usr/X11R6/lib -W -Wall
-  DYNAMICLIBRARYLIB = -ldl
+  LINKARGS          = -W -Wall
+  DYNAMICLIBRARYLIB =
 
   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  GLUT_LIB          = -lglut32
   GL_LIBS           = -lglu32 -lopengl32
+  GLUT_LIB          = -lglut32 $(GL_LIBS)
   X_LIBS            = -lgdi32 -luser32
   OSGDB_LIBS        = -losgdb_3ds \
   		      -losgdb_bmp \
@@ -201,7 +201,7 @@ ifeq ($(OS),Cygwin)
 		      -losgdb_tiff \
 		      -losgdb_zip
   SOCKET_LIBS       = 
-  OTHER_LIBS        = 
+  OTHER_LIBS        = $(GL_LIBS)
   SO_EXT            = dll
   PLUGIN_EXT        = dll
 endif