diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | makefiles/config.mingw | 6 | ||||
| -rw-r--r-- | makefiles/config.os2x | 5 | ||||
| -rw-r--r-- | makefiles/makeinclude.mingw | 5 | ||||
| -rw-r--r-- | makefiles/makeinclude.mingw31 | 116 | ||||
| -rw-r--r-- | makefiles/makeinclude.os2x | 5 |
6 files changed, 127 insertions, 11 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.0 + - Added new makeinclude file for MingW using GCC 3.1.x. - Fl_Choice::value(n) didn't range check "n". - The MingW and OS/2 makeinclude files didn't have the new fltk_images library definitions. diff --git a/makefiles/config.mingw b/makefiles/config.mingw index 095fea8f9..f7eb30a57 100644 --- a/makefiles/config.mingw +++ b/makefiles/config.mingw @@ -1,9 +1,9 @@ /* - * "$Id: config.mingw,v 1.1.2.3.2.7 2002/05/24 14:50:20 easysw Exp $" + * "$Id: config.mingw,v 1.1.2.3.2.8 2002/07/09 17:41:24 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2001 by Bill Spitzak and others. + * Copyright 1998-2002 by Bill Spitzak and others. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -216,5 +216,5 @@ /* - * End of "$Id: config.mingw,v 1.1.2.3.2.7 2002/05/24 14:50:20 easysw Exp $". + * End of "$Id: config.mingw,v 1.1.2.3.2.8 2002/07/09 17:41:24 easysw Exp $". */ diff --git a/makefiles/config.os2x b/makefiles/config.os2x index 50934043c..836bab6aa 100644 --- a/makefiles/config.os2x +++ b/makefiles/config.os2x @@ -1,9 +1,8 @@ /* config.h. Generated automatically by configure. */ /* - * "$Id: config.os2x,v 1.1.2.4.2.9 2002/05/21 18:13:32 easysw Exp $" + * "$Id: config.os2x,v 1.1.2.4.2.10 2002/07/09 17:41:24 easysw Exp $" * * Configuration file for the Fast Light Tool Kit (FLTK). - * @configure_input@ * * Copyright 1998-2002 by Bill Spitzak and others. * @@ -222,5 +221,5 @@ /* - * End of "$Id: config.os2x,v 1.1.2.4.2.9 2002/05/21 18:13:32 easysw Exp $". + * End of "$Id: config.os2x,v 1.1.2.4.2.10 2002/07/09 17:41:24 easysw Exp $". */ diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw index 3ae73821e..19a1425da 100644 --- a/makefiles/makeinclude.mingw +++ b/makefiles/makeinclude.mingw @@ -1,7 +1,8 @@ # -# "$Id: makeinclude.mingw,v 1.1.2.3.2.9 2002/07/08 20:14:06 easysw Exp $" +# "$Id: makeinclude.mingw,v 1.1.2.3.2.10 2002/07/09 17:41:24 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). +# (this file for MingW using GCC 2.95.x) # # Copyright 1998-2001 by Bill Spitzak and others. # @@ -111,5 +112,5 @@ THREADS =threads $(CXX) -I.. $(CXXFLAGS) $< -c # -# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.9 2002/07/08 20:14:06 easysw Exp $". +# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.10 2002/07/09 17:41:24 easysw Exp $". # diff --git a/makefiles/makeinclude.mingw31 b/makefiles/makeinclude.mingw31 new file mode 100644 index 000000000..9676b7a75 --- /dev/null +++ b/makefiles/makeinclude.mingw31 @@ -0,0 +1,116 @@ +# +# "$Id: makeinclude.mingw31,v 1.1.2.1 2002/07/09 17:41:24 easysw Exp $" +# +# Make include file for the Fast Light Tool Kit (FLTK). +# (this file for MingW using GCC 3.1.x) +# +# Copyright 1998-2002 by Bill Spitzak and others. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. +# +# Please report all bugs and problems to "fltk-bugs@fltk.org". +# + +# Notes: +# +# 1) Console windows appearing +# +# Consoles will not appear when run from a command line prompt +# 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 add "-mwindows" to LDLIBS and GLDLIBS below +# +# 2) Stripping the executable to reduce size +# +# An external program may be run to strip out any debug symbols: +# strip filename.exe +# +# Alternatively add -s option to LDLIBS and GLDLIBS below to strip all +# symbols. (or -S for stripping of debug symbols only). See 'ld' man page +# for other useful link-time options. +# +# The default is to leave -mwindows and the stripping off, so as to facilitate +# debugging. For release it may be appropriate to add these additional switches + + +prefix = /usr/local +exec_prefix = ${prefix} +bindir = ${exec_prefix}/bin +includedir = ${prefix}/include +libdir = ${exec_prefix}/lib +srcdir = . + +# compiler names: +CXX = g++ +CC = gcc +MAKEDEPEND = $(CXX) -M +POSTBUILD = : + +# flags for C++ compiler: +CFLAGS = -Wall -O2 -DWIN32 +CXXFLAGS = -Wall -O2 -DWIN32 + +# program to make the archive: +LIBNAME = ../lib/libfltk.a +FLLIBNAME = ../lib/libfltk_forms.a +GLLIBNAME = ../lib/libfltk_gl.a +IMGLIBNAME = ../lib/libfltk_images.a +LIBCOMMAND = ar -ruv +RM = del +RANLIB = ranlib +DSONAME = +FLDSONAME = +GLDSONAME = +IMGDSONAME = +DSOCOMMAND = echo + +# libraries to link with (in addition to default libs): +LDLIBS =-mwindows -lole32 -luuid -lgdi32 -lcomctl32 -lwsock32 -lsupc++ +GLDLIBS =-mwindows -lole32 -luuid -lglu32 -lopengl32 -lgdi32 -lcomctl32 -lwsock32 -lsupc++ +LINKFLTK =-L../lib -lfltk +LINKFLTKGL =-L../lib -lfltk_gl +LINKFLTKFORMS =-L../lib -lfltk_forms -lfltk +LINKFLTKIMG =-L../lib -lfltk_images -lfltk +IMAGELIBS = + +# Do we build the OpenGL demos? +GLDEMOS =gldemos + +# Do we build the threads demo? +THREADS =threads + +# Be quiet when building... +.SILENT: + +# Build commands and filename extensions... +.SUFFIXES: .c .cxx .h .fl .o + +.cxx: + echo Compiling and linking $@... + $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + +.c.o: + echo Compiling $@... + $(CC) -I.. $(CXXFLAGS) $< -c + +.cxx.o: + echo Compiling $@... + $(CXX) -I.. $(CXXFLAGS) $< -c + +# +# End of "$Id: makeinclude.mingw31,v 1.1.2.1 2002/07/09 17:41:24 easysw Exp $". +# diff --git a/makefiles/makeinclude.os2x b/makefiles/makeinclude.os2x index 8c2a52055..d38783748 100644 --- a/makefiles/makeinclude.os2x +++ b/makefiles/makeinclude.os2x @@ -1,8 +1,7 @@ # -# "$Id: makeinclude.os2x,v 1.1.2.4.2.7 2002/07/08 20:14:07 easysw Exp $" +# "$Id: makeinclude.os2x,v 1.1.2.4.2.8 2002/07/09 17:41:24 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). -# Generated automatically from makeinclude.in by configure. # # Copyright 1998-2002 by Bill Spitzak and others. # @@ -119,5 +118,5 @@ CAT3EXT =3 mv t.z $@ # -# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.7 2002/07/08 20:14:07 easysw Exp $". +# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.8 2002/07/09 17:41:24 easysw Exp $". # |