Fixes for the Cygwin, MingW, and OS/2 build stuff.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1634 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2001-10-16 20:19:22 +00:00
parent 90784b7e65
commit ea60692bf5
5 changed files with 35 additions and 16 deletions

View File

@ -6,6 +6,9 @@ CHANGES IN FLTK 1.1.0b4
- Updated the config.h files for all platforms for the
image and FLTK documentation defines.
- Updated the makeinclude files for all platforms to
match the current makeinclude.in file.
- FLUID would crash if you cleared an image for a
widget.

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.cygwin,v 1.1.2.2 2001/01/22 15:13:39 easysw Exp $"
# "$Id: makeinclude.cygwin,v 1.1.2.2.2.1 2001/10/16 20:19:22 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -62,7 +62,8 @@ CFLAGS = -Wall -O2 -DWIN32
CXXFLAGS = -Wall -O2 -DWIN32
# program to make the archive:
LIBNAME = libfltk.a
LIBNAME = ../lib/libfltk.a
GLLIBNAME = ../lib/libfltk_gl.a
LIBCOMMAND = ar -ruv
RANLIB = ranlib
DSONAME =
@ -71,6 +72,9 @@ DSOCOMMAND = echo
# libraries to link with (in addition to default libs):
LDLIBS = -lgdi32 -lwsock32
GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
LINKFLTK =-L../lib -lfltk
LINKFLTKGL =-L../lib -lfltk_gl
IMAGELIBS =
# Be quiet when building...
.SILENT:
@ -80,7 +84,7 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
.cxx:
echo Compiling and linking $@...
$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
.c.o:
echo Compiling $@...
@ -91,5 +95,5 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.cygwin,v 1.1.2.2 2001/01/22 15:13:39 easysw Exp $".
# End of "$Id: makeinclude.cygwin,v 1.1.2.2.2.1 2001/10/16 20:19:22 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $"
# "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -62,7 +62,8 @@ CFLAGS = -Wall -O2 -DWIN32
CXXFLAGS = -Wall -O2 -DWIN32
# program to make the archive:
LIBNAME = libfltk.a
LIBNAME = ../lib/libfltk.a
GLLIBNAME = ../lib/libfltk_gl.a
LIBCOMMAND = ar -ruv
RANLIB = ranlib
DSONAME =
@ -71,6 +72,9 @@ DSOCOMMAND = echo
# libraries to link with (in addition to default libs):
LDLIBS = -lgdi32 -lwsock32
GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
LINKFLTK =-L../lib -lfltk
LINKFLTKGL =-L../lib -lfltk_gl
IMAGELIBS =
# Be quiet when building...
.SILENT:
@ -80,7 +84,7 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
.cxx:
echo Compiling and linking $@...
$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
.c.o:
echo Compiling $@...
@ -91,5 +95,5 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $".
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.no-cygwin,v 1.1.2.4 2001/01/22 15:13:39 easysw Exp $"
# "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -62,7 +62,8 @@ CFLAGS = -Wall -O2 -DWIN32
CXXFLAGS = -Wall -O2 -DWIN32
# program to make the archive:
LIBNAME = libfltk.a
LIBNAME = ../lib/libfltk.a
GLLIBNAME = ../lib/libfltk_gl.a
LIBCOMMAND = ar -ruv
RANLIB = ranlib
DSONAME =
@ -71,6 +72,9 @@ DSOCOMMAND = echo
# libraries to link with (in addition to default libs):
LDLIBS = -lgdi32 -lwsock32
GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
LINKFLTK =-L../lib -lfltk
LINKFLTKGL =-L../lib -lfltk_gl
IMAGELIBS =
# Be quiet when building...
.SILENT:
@ -80,7 +84,7 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
.cxx:
echo Compiling and linking $@...
$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
.c.o:
echo Compiling $@...
@ -91,5 +95,5 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.no-cygwin,v 1.1.2.4 2001/01/22 15:13:39 easysw Exp $".
# End of "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $".
#

View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.os2x,v 1.1.2.4 2001/05/06 13:32:48 easysw Exp $"
# "$Id: makeinclude.os2x,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# Generated automatically from makeinclude.in by configure.
@ -48,7 +48,8 @@ CXXFLAGS =-Wall -O4 -mpentium -Zmt -fno-exceptions
LDFLAGS =-s -Zexe -Zmt -Zcrtdll -Zbsd-signals -Zbin-files -fno-exceptions
# program to make the archive:
LIBNAME =fltk.a
LIBNAME =../lib/fltk.a
GLLIBNAME =../lib/fltk_gl.a
LIBCOMMAND =ar cr
RANLIB =ar.exe s
DSONAME =
@ -57,6 +58,9 @@ DSOCOMMAND =echo
# libraries to link with:
LDLIBS =-lX11 -lXext -lsocket -lshm -lm
GLDLIBS =-lX11 -lXext -lsocket -lshm -lm
LINKFLTK =-L../lib -lfltk
LINKFLTKGL =-L../lib -lfltk_gl
IMAGELIBS =
# Man page extensions...
CAT1EXT =1
@ -70,7 +74,7 @@ CAT3EXT =3
.cxx:
echo Compiling and linking $@...
$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
.c.o:
echo Compiling $@...
@ -93,5 +97,5 @@ CAT3EXT =3
mv t.z $@
#
# End of "$Id: makeinclude.os2x,v 1.1.2.4 2001/05/06 13:32:48 easysw Exp $".
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $".
#