summaryrefslogtreecommitdiff
path: root/makefiles/makeinclude.no-cygwin
diff options
context:
space:
mode:
authorCarl E. Thompson <devel-fltk@carlthompson.net>2000-06-20 18:47:33 +0000
committerCarl E. Thompson <devel-fltk@carlthompson.net>2000-06-20 18:47:33 +0000
commit463681c1ca48d148d9df2f64ac81a996b8b0547a (patch)
treed839ac3046fcd2787811006961178a193e9bb977 /makefiles/makeinclude.no-cygwin
parent52496ba47284b6362e28ebfd736900b72e1a0723 (diff)
Fixes for Cygwin and MinGW.
Carl git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1230 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'makefiles/makeinclude.no-cygwin')
-rw-r--r--makefiles/makeinclude.no-cygwin23
1 files changed, 9 insertions, 14 deletions
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 $".
#