From 463681c1ca48d148d9df2f64ac81a996b8b0547a Mon Sep 17 00:00:00 2001 From: "Carl E. Thompson" Date: Tue, 20 Jun 2000 18:47:33 +0000 Subject: Fixes for Cygwin and MinGW. Carl git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1230 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- makefiles/Makefile.cygnus | 96 ------------------------ makefiles/Makefile.cygwin | 96 ++++++++++++++++++++++++ makefiles/Makefile.os2x | 12 +-- makefiles/config.cygnus | 157 ---------------------------------------- makefiles/config.cygwin | 157 ++++++++++++++++++++++++++++++++++++++++ makefiles/makeinclude.cygnus | 100 ------------------------- makefiles/makeinclude.cygwin | 95 ++++++++++++++++++++++++ makefiles/makeinclude.mingw | 10 +-- makefiles/makeinclude.no-cygwin | 23 +++--- 9 files changed, 366 insertions(+), 380 deletions(-) delete mode 100644 makefiles/Makefile.cygnus create mode 100644 makefiles/Makefile.cygwin delete mode 100644 makefiles/config.cygnus create mode 100644 makefiles/config.cygwin delete mode 100644 makefiles/makeinclude.cygnus create mode 100644 makefiles/makeinclude.cygwin (limited to 'makefiles') diff --git a/makefiles/Makefile.cygnus b/makefiles/Makefile.cygnus deleted file mode 100644 index dd89577bf..000000000 --- a/makefiles/Makefile.cygnus +++ /dev/null @@ -1,96 +0,0 @@ -# -# "$Id: Makefile.cygnus,v 1.1.2.2 2000/06/13 20:33:33 mike Exp $" -# -# Top-level makefile for the Fast Light Tool Kit (FLTK). -# -# Copyright 1998-2000 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". -# - -# By default use a Un*x-style shell -# -# uncomment next line to use NT command shell -# SHELL=cmd.exe -# -# or uncomment next line to explicitly use a unix-compatible shell -# SHELL=sh.exe -# -# If we are using a Un*x-based make, make sure the environmental var is set -# set MAKE_MODE=unix -# -# By default, a Un*x style make is assumed, so towards the bottom of this -# file filenames are copied with 'cp' and use forward slashes throughout -# in filepaths. -# -# Changing to a Windows-based command line would require 'cp' replaced with -# a local equivalent ('copy' is OK) and potentially for forward-slashes in -# filepaths to be replaced by back-slashes. - - -all: makeinclude config.h - echo "=== making src ===" - touch src/makedepend - cd src ; $(MAKE) - echo "=== making fluid ===" - touch fluid/makedepend - cd fluid ; $(MAKE) - echo "=== making test ===" - touch test/makedepend - cd test ; $(MAKE) - -install: - echo "=== installing src ===" - touch src/makedepend - cd src ; $(MAKE) install - echo "=== installing fluid ===" - touch fluid/makedepend - cd fluid ; $(MAKE) install - -depend: - echo "=== making src dependencies ===" - touch src/makedepend - cd src ; $(MAKE) depend - echo "=== making fluid dependencies ===" - touch fluid/makedepend - cd fluid ; $(MAKE) depend - echo "=== making test dependencies ===" - touch test/makedepend - cd test ; $(MAKE) depend - -clean: - -@ rm -f core config.cache *.o *.bck - echo "=== cleaning src ===" - touch src/makedepend - cd src ; $(MAKE) clean - echo "=== cleaning fluid ===" - touch fluid/makedepend - cd fluid ; $(MAKE) clean - echo "=== cleaning test ===" - touch test/makedepend - cd test ; $(MAKE) clean - -config.h: makefiles/config.cygnus - cp $< $@ - -makeinclude: makefiles/makeinclude.cygnus - cp $< $@ - -# -# End of "$Id: Makefile.cygnus,v 1.1.2.2 2000/06/13 20:33:33 mike Exp $". -# diff --git a/makefiles/Makefile.cygwin b/makefiles/Makefile.cygwin new file mode 100644 index 000000000..8b05470c8 --- /dev/null +++ b/makefiles/Makefile.cygwin @@ -0,0 +1,96 @@ +# +# "$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). +# +# Copyright 1998-2000 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". +# + +# By default use a Un*x-style shell +# +# uncomment next line to use NT command shell +# SHELL=cmd.exe +# +# or uncomment next line to explicitly use a unix-compatible shell +# SHELL=sh.exe +# +# If we are using a Un*x-based make, make sure the environmental var is set +# set MAKE_MODE=unix +# +# By default, a Un*x style make is assumed, so towards the bottom of this +# file filenames are copied with 'cp' and use forward slashes throughout +# in filepaths. +# +# Changing to a Windows-based command line would require 'cp' replaced with +# a local equivalent ('copy' is OK) and potentially for forward-slashes in +# filepaths to be replaced by back-slashes. + + +all: makeinclude config.h + echo "=== making src ===" + touch src/makedepend + cd src ; $(MAKE) + echo "=== making fluid ===" + touch fluid/makedepend + cd fluid ; $(MAKE) + echo "=== making test ===" + touch test/makedepend + cd test ; $(MAKE) + +install: + echo "=== installing src ===" + touch src/makedepend + cd src ; $(MAKE) install + echo "=== installing fluid ===" + touch fluid/makedepend + cd fluid ; $(MAKE) install + +depend: + echo "=== making src dependencies ===" + touch src/makedepend + cd src ; $(MAKE) depend + echo "=== making fluid dependencies ===" + touch fluid/makedepend + cd fluid ; $(MAKE) depend + echo "=== making test dependencies ===" + touch test/makedepend + cd test ; $(MAKE) depend + +clean: + -@ rm -f core config.cache *.o *.bck + echo "=== cleaning src ===" + touch src/makedepend + cd src ; $(MAKE) clean + echo "=== cleaning fluid ===" + touch fluid/makedepend + cd fluid ; $(MAKE) clean + echo "=== cleaning test ===" + touch test/makedepend + cd test ; $(MAKE) clean + +config.h: makefiles/config.cygwin + cp $< $@ + +makeinclude: makefiles/makeinclude.cygwin + cp $< $@ + +# +# 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.cygnus deleted file mode 100644 index 0c24cb9fc..000000000 --- a/makefiles/config.cygnus +++ /dev/null @@ -1,157 +0,0 @@ -/* - * "$Id: config.cygnus,v 1.4.2.3 2000/06/13 20:33:35 mike Exp $" - * - * Configuration file for the Fast Light Tool Kit (FLTK). - * - * Copyright 1998-2000 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". - */ - -/* - * BORDER_WIDTH: - * - * Thickness of FL_UP_BOX and FL_DOWN_BOX. Current 1,2, and 3 are - * supported. - * - * 3 is the historic FLTK look. - * 2 is the default and looks like Microsoft Windows, KDE, and Qt. - * 1 is a plausible future evolution... - * - * Note that this may be simulated at runtime by redefining the boxtypes - * using Fl::set_boxtype(). - */ - -#define BORDER_WIDTH 2 - -/* - * HAVE_GL: - * - * Do you have OpenGL? Set this to 0 if you don't have or plan to use - * OpenGL, and FLTK will be smaller. - * - * In order to set to 1 you will need to obtain the OpenGL header and - * library files. Consult the README.win32 file for further details. - */ - -#define HAVE_GL 0 - -/* - * USE_COLORMAP: - * - * Setting this to zero will save a good deal of code (especially for - * fl_draw_image), but FLTK will only work on TrueColor visuals. - */ - -#define USE_COLORMAP 1 - -/* - * HAVE_XDBE: - * - * Do we have the X double-buffer extension? - */ - -#define HAVE_XDBE 0 - -/* - * USE_XDBE: - * - * Actually try to use the double-buffer extension? Set this to zero - * disable use of XDBE without breaking the list_visuals program. - */ - -#define USE_XDBE HAVE_XDBE - -/* - * HAVE_OVERLAY: - * - * Use the X overlay extension? FLTK will try to use an overlay - * visual for Fl_Overlay_Window, the Gl_Window overlay, and for the - * menus. Setting this to zero will remove a substantial amount of - * code from FLTK. Overlays have only been tested on SGI servers! - */ - -#define HAVE_OVERLAY 0 - -/* - * HAVE_GL_OVERLAY: - * - * It is possible your GL has an overlay even if X does not. If so, - * set this to 1. - */ - -#define HAVE_GL_OVERLAY HAVE_OVERLAY - -/* - * WORDS_BIGENDIAN: - * - * Byte order of your machine: 1 = big-endian, 0 = little-endian. - */ - -#define WORDS_BIGENDIAN 0 - -/* - * U16, U32, U64: - * - * Types used by fl_draw_image. One of U32 or U64 must be defined. - * U16 is optional but FLTK will work better with it! - */ - -#define U16 unsigned short -#define U32 unsigned -/* #undef U64 */ - -/* - * HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR: - * - * Where is (used only by fl_file_chooser and scandir). - */ - -#define HAVE_DIRENT_H 1 -#define HAVE_SYS_NDIR_H 0 -#define HAVE_SYS_DIR_H 0 -#define HAVE_NDIR_H 0 -#define HAVE_SCANDIR 1 - -/* - * possibly missing sprintf-style functions: - */ - -#define HAVE_VSNPRINTF 1 -#define HAVE_SNPRINTF 1 -#define HAVE_VSPRINTF 1 - -/* - * HAVE_SYS_SELECT_H: - * - * Whether or not select() call has its own header file. - */ - -#define HAVE_SYS_SELECT_H 0 - -/* - * HAVE_POLL: - * - * Use poll() if we don't have select(). - */ - -#define HAVE_POLL 0 - -/* - * End of "$Id: config.cygnus,v 1.4.2.3 2000/06/13 20:33:35 mike Exp $". - */ diff --git a/makefiles/config.cygwin b/makefiles/config.cygwin new file mode 100644 index 000000000..ea0dc5571 --- /dev/null +++ b/makefiles/config.cygwin @@ -0,0 +1,157 @@ +/* + * "$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). + * + * Copyright 1998-2000 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". + */ + +/* + * BORDER_WIDTH: + * + * Thickness of FL_UP_BOX and FL_DOWN_BOX. Current 1,2, and 3 are + * supported. + * + * 3 is the historic FLTK look. + * 2 is the default and looks like Microsoft Windows, KDE, and Qt. + * 1 is a plausible future evolution... + * + * Note that this may be simulated at runtime by redefining the boxtypes + * using Fl::set_boxtype(). + */ + +#define BORDER_WIDTH 2 + +/* + * HAVE_GL: + * + * Do you have OpenGL? Set this to 0 if you don't have or plan to use + * OpenGL, and FLTK will be smaller. + * + * In order to set to 1 you will need to obtain the OpenGL header and + * library files. Consult the README.win32 file for further details. + */ + +#define HAVE_GL 0 + +/* + * USE_COLORMAP: + * + * Setting this to zero will save a good deal of code (especially for + * fl_draw_image), but FLTK will only work on TrueColor visuals. + */ + +#define USE_COLORMAP 1 + +/* + * HAVE_XDBE: + * + * Do we have the X double-buffer extension? + */ + +#define HAVE_XDBE 0 + +/* + * USE_XDBE: + * + * Actually try to use the double-buffer extension? Set this to zero + * disable use of XDBE without breaking the list_visuals program. + */ + +#define USE_XDBE HAVE_XDBE + +/* + * HAVE_OVERLAY: + * + * Use the X overlay extension? FLTK will try to use an overlay + * visual for Fl_Overlay_Window, the Gl_Window overlay, and for the + * menus. Setting this to zero will remove a substantial amount of + * code from FLTK. Overlays have only been tested on SGI servers! + */ + +#define HAVE_OVERLAY 0 + +/* + * HAVE_GL_OVERLAY: + * + * It is possible your GL has an overlay even if X does not. If so, + * set this to 1. + */ + +#define HAVE_GL_OVERLAY HAVE_OVERLAY + +/* + * WORDS_BIGENDIAN: + * + * Byte order of your machine: 1 = big-endian, 0 = little-endian. + */ + +#define WORDS_BIGENDIAN 0 + +/* + * U16, U32, U64: + * + * Types used by fl_draw_image. One of U32 or U64 must be defined. + * U16 is optional but FLTK will work better with it! + */ + +#define U16 unsigned short +#define U32 unsigned +/* #undef U64 */ + +/* + * HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR: + * + * Where is (used only by fl_file_chooser and scandir). + */ + +#define HAVE_DIRENT_H 1 +#define HAVE_SYS_NDIR_H 0 +#define HAVE_SYS_DIR_H 0 +#define HAVE_NDIR_H 0 +#define HAVE_SCANDIR 1 + +/* + * possibly missing sprintf-style functions: + */ + +#define HAVE_VSNPRINTF 1 +#define HAVE_SNPRINTF 1 +#define HAVE_VSPRINTF 1 + +/* + * HAVE_SYS_SELECT_H: + * + * Whether or not select() call has its own header file. + */ + +#define HAVE_SYS_SELECT_H 0 + +/* + * HAVE_POLL: + * + * Use poll() if we don't have select(). + */ + +#define HAVE_POLL 0 + +/* + * 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.cygnus deleted file mode 100644 index 798a0244c..000000000 --- a/makefiles/makeinclude.cygnus +++ /dev/null @@ -1,100 +0,0 @@ -# -# "$Id: makeinclude.cygnus,v 1.9.2.6 2000/06/20 17:54:41 mike Exp $" -# -# Make include file for the Fast Light Tool Kit (FLTK). -# -# Copyright 1998-2000 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 cygwin shell 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 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 -# -# 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 - -# flags for C++ compiler: -CFLAGS = -Wall -O2 -DWIN32 -CXXFLAGS = -Wall -O2 -DWIN32 - -# program to make the archive: -LIBNAME = libfltk.a -LIBCOMMAND = ar -ruv -RANLIB = ranlib -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 - -# Be quiet when building... -.SILENT: - -# Build commands and filename extensions... -.SUFFIXES: .c .cxx .h .fl .o - -.cxx: - echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ - -.c.o: - echo Compiling $@... - $(CC) -I.. $(CXXFLAGS) $< -c - -.cxx.o: - echo Compiling $@... - $(CXX) -I.. $(CXXFLAGS) $< -c - -# -# End of "$Id: makeinclude.cygnus,v 1.9.2.6 2000/06/20 17:54:41 mike Exp $". -# diff --git a/makefiles/makeinclude.cygwin b/makefiles/makeinclude.cygwin new file mode 100644 index 000000000..2f535bb46 --- /dev/null +++ b/makefiles/makeinclude.cygwin @@ -0,0 +1,95 @@ +# +# "$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). +# +# Copyright 1998-2000 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 cygwin shell 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 + +# flags for C++ compiler: +CFLAGS = -Wall -O2 -DWIN32 +CXXFLAGS = -Wall -O2 -DWIN32 + +# program to make the archive: +LIBNAME = libfltk.a +LIBCOMMAND = ar -ruv +RANLIB = ranlib +DSONAME = +DSOCOMMAND = echo + +# libraries to link with (in addition to default libs): +LDLIBS = -lgdi32 -lwsock32 +GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32 + +# Be quiet when building... +.SILENT: + +# Build commands and filename extensions... +.SUFFIXES: .c .cxx .h .fl .o + +.cxx: + echo Compiling and linking $@... + $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ + +.c.o: + echo Compiling $@... + $(CC) -I.. $(CXXFLAGS) $< -c + +.cxx.o: + echo Compiling $@... + $(CXX) -I.. $(CXXFLAGS) $< -c + +# +# 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 $". # -- cgit v1.2.3