Fixes for Cygwin and MinGW.

Carl


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1230 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

6 files changed, 27 insertions, 41 deletions

diff --git a/makefiles/Makefile.cygnus b/makefiles/Makefile.cygwin
index dd89577bf..8b05470c8 100644
--- a/makefiles/Makefile.cygnus
+++ b/makefiles/Makefile.cygwin
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile.cygnus,v 1.1.2.2 2000/06/13 20:33:33 mike Exp $"
+# "$Id: Makefile.cygwin,v 1.1.2.1 2000/06/20 18:47:31 carl Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -85,12 +85,12 @@ clean:
 	touch test/makedepend
 	cd test ; $(MAKE) clean
 
-config.h: makefiles/config.cygnus
+config.h: makefiles/config.cygwin
 	cp $< $@
 
-makeinclude: makefiles/makeinclude.cygnus
+makeinclude: makefiles/makeinclude.cygwin
 	cp $< $@
 
 #
-# End of "$Id: Makefile.cygnus,v 1.1.2.2 2000/06/13 20:33:33 mike Exp $".
+# End of "$Id: Makefile.cygwin,v 1.1.2.1 2000/06/20 18:47:31 carl Exp $".
 #
diff --git a/makefiles/Makefile.os2x b/makefiles/Makefile.os2x
index 37b812460..8dbd42396 100644
--- a/makefiles/Makefile.os2x
+++ b/makefiles/Makefile.os2x
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile.os2x,v 1.6.2.2 2000/06/13 20:33:34 mike Exp $"
+# "$Id: Makefile.os2x,v 1.6.2.3 2000/06/20 18:47:31 carl Exp $"
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -67,12 +67,12 @@ clean:
 	touch test/makedepend
 	cd test & $(MAKE) clean
 
-config.h: makefiles\config.os2x
-	copy $< $@
+config.h: makefiles/config.os2x
+	cp $< $@
 
-makeinclude: makefiles\makeinclude.os2x
-	copy $< $@
+makeinclude: makefiles/makeinclude.os2x
+	cp $< $@
 
 #
-# End of "$Id: Makefile.os2x,v 1.6.2.2 2000/06/13 20:33:34 mike Exp $".
+# End of "$Id: Makefile.os2x,v 1.6.2.3 2000/06/20 18:47:31 carl Exp $".
 #
diff --git a/makefiles/config.cygnus b/makefiles/config.cygwin
index 0c24cb9fc..ea0dc5571 100644
--- a/makefiles/config.cygnus
+++ b/makefiles/config.cygwin
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.cygnus,v 1.4.2.3 2000/06/13 20:33:35 mike Exp $"
+ * "$Id: config.cygwin,v 1.1.2.1 2000/06/20 18:47:32 carl Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  *
@@ -153,5 +153,5 @@
 #define HAVE_POLL 0
 
 /*
- * End of "$Id: config.cygnus,v 1.4.2.3 2000/06/13 20:33:35 mike Exp $".
+ * End of "$Id: config.cygwin,v 1.1.2.1 2000/06/20 18:47:32 carl Exp $".
  */
diff --git a/makefiles/makeinclude.cygnus b/makefiles/makeinclude.cygwin
index 798a0244c..2f535bb46 100644
--- a/makefiles/makeinclude.cygnus
+++ b/makefiles/makeinclude.cygwin
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.cygnus,v 1.9.2.6 2000/06/20 17:54:41 mike Exp $"
+# "$Id: makeinclude.cygwin,v 1.1.2.1 2000/06/20 18:47:33 carl Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -31,11 +31,7 @@
 #    but will cause an 'unnecessary' console to appear when run directly from
 #    windows (say explorer). It provides i/o for stdin/stdout for debugging
 #
-#    To avoid this use an additional compile/link switch to move the program
-#    entry point to WinMain(). If not defined a link warning may appear
-#    but the program will run correctly from main() and not produce a console.
-#    Adding -mwindows to CFLAGS,CXXFLAGS,LDLIBS,GLDLIBS below
-#    will cause this revised behaviour
+#    To avoid this add "-mwindows" to LDLIBS and GLDLIBS below
 #
 # 2) Stripping the executable to reduce size
 #
@@ -73,7 +69,6 @@ DSONAME		=
 DSOCOMMAND	= echo
 
 # libraries to link with (in addition to default libs):
-# (Note: -lm may be required with older versions of the Cygwin environment)
 LDLIBS		=  -lgdi32 -lwsock32
 GLDLIBS		=  -lglu32 -lopengl32 -lgdi32 -lwsock32
 
@@ -96,5 +91,5 @@ GLDLIBS		=  -lglu32 -lopengl32 -lgdi32 -lwsock32
 	$(CXX) -I.. $(CXXFLAGS) $< -c
 
 #
-# End of "$Id: makeinclude.cygnus,v 1.9.2.6 2000/06/20 17:54:41 mike Exp $".
+# End of "$Id: makeinclude.cygwin,v 1.1.2.1 2000/06/20 18:47:33 carl Exp $".
 #
diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw
index 640d5f237..f00e15dcb 100644
--- a/makefiles/makeinclude.mingw
+++ b/makefiles/makeinclude.mingw
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.mingw,v 1.1.2.1 2000/06/13 20:33:35 mike Exp $"
+# "$Id: makeinclude.mingw,v 1.1.2.2 2000/06/20 18:47:33 carl Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -31,11 +31,7 @@
 #    but will cause an 'unnecessary' console to appear when run directly from
 #    windows (say explorer). It provides i/o for stdin/stdout for debugging
 #
-#    To avoid this use an additional compile/link switch to move the program
-#    entry point to WinMain(). If not defined a link warning may appear
-#    but the program will run correctly from main() and not produce a console.
-#    Adding -mwindows to CFLAGS,CXXFLAGS,LDLIBS,GLDLIBS below
-#    will cause this revised behaviour
+#    To avoid this add "-mwindows" to LDLIBS and GLDLIBS below
 #
 # 2) Stripping the executable to reduce size
 #
@@ -95,5 +91,5 @@ GLDLIBS		= -lglu32 -lopengl32 -lgdi32 -lwsock32
 	$(CXX) -I.. $(CXXFLAGS) $< -c
 
 #
-# End of "$Id: makeinclude.mingw,v 1.1.2.1 2000/06/13 20:33:35 mike Exp $".
+# End of "$Id: makeinclude.mingw,v 1.1.2.2 2000/06/20 18:47:33 carl Exp $".
 #
diff --git a/makefiles/makeinclude.no-cygwin b/makefiles/makeinclude.no-cygwin
index 45dcd17c9..457ec3a32 100644
--- a/makefiles/makeinclude.no-cygwin
+++ b/makefiles/makeinclude.no-cygwin
@@ -1,5 +1,5 @@
 #
-# "$Id: makeinclude.no-cygwin,v 1.1.2.2 2000/06/20 17:54:41 mike Exp $"
+# "$Id: makeinclude.no-cygwin,v 1.1.2.3 2000/06/20 18:47:33 carl Exp $"
 #
 # Make include file for the Fast Light Tool Kit (FLTK).
 #
@@ -31,11 +31,7 @@
 #    but will cause an 'unnecessary' console to appear when run directly from
 #    windows (say explorer). It provides i/o for stdin/stdout for debugging
 #
-#    To avoid this use an additional compile/link switch to move the program
-#    entry point to WinMain(). If not defined a link warning may appear
-#    but the program will run correctly from main() and not produce a console.
-#    Adding -mwindows to CFLAGS,CXXFLAGS,LDLIBS,GLDLIBS below
-#    will cause this revised behaviour
+#    To avoid this add "-mwindows" to LDLIBS and GLDLIBS below
 #
 # 2) Stripping the executable to reduce size
 #
@@ -58,12 +54,12 @@ libdir          = ${exec_prefix}/lib
 srcdir          = .
 
 # compiler names:
-CXX		= g++
-CC		= gcc
+CXX		= g++ -mno-cygwin
+CC		= gcc -mno-cygwin
 
 # flags for C++ compiler:
-CFLAGS		= -Wall -O2 -DWIN32 -mno-cygwin
-CXXFLAGS	= -Wall -O2 -DWIN32 -mno-cygwin
+CFLAGS		= -Wall -O2 -DWIN32
+CXXFLAGS	= -Wall -O2 -DWIN32
 
 # program to make the archive:
 LIBNAME		= libfltk.a
@@ -73,9 +69,8 @@ DSONAME		=
 DSOCOMMAND	= echo
 
 # libraries to link with (in addition to default libs):
-# (Note: -lm may be required with older versions of the Cygwin environment)
-LDLIBS		=  -lgdi32 -lwsock32 -mno-cygwin
-GLDLIBS		=  -lglu32 -lopengl32 -lgdi32 -lwsock32 -mno-cygwin
+LDLIBS		=  -lgdi32 -lwsock32
+GLDLIBS		=  -lglu32 -lopengl32 -lgdi32 -lwsock32
 
 # Be quiet when building...
 .SILENT:
@@ -96,5 +91,5 @@ GLDLIBS		=  -lglu32 -lopengl32 -lgdi32 -lwsock32 -mno-cygwin
 	$(CXX) -I.. $(CXXFLAGS) $< -c
 
 #
-# End of "$Id: makeinclude.no-cygwin,v 1.1.2.2 2000/06/20 17:54:41 mike Exp $".
+# End of "$Id: makeinclude.no-cygwin,v 1.1.2.3 2000/06/20 18:47:33 carl Exp $".
 #