mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MingW and OS/2 makeinclude files...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2496 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-07-08 20:14:07 +00:00
parent e8ccc2cf7c
commit 81d431ccf5
3 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.0
- The MingW and OS/2 makeinclude files didn't have the
new fltk_images library definitions.
- Fl_Text_Editor didn't scroll the text in the widget
when dragging text.
- Config header file changes for Borland C++.

7
makefiles/makeinclude.mingw
View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.mingw,v 1.1.2.3.2.8 2002/06/26 12:03:28 easysw Exp $"
# "$Id: makeinclude.mingw,v 1.1.2.3.2.9 2002/07/08 20:14:06 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@ -67,12 +67,14 @@ CXXFLAGS = -Wall -O2 -DWIN32
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):
@ -81,6 +83,7 @@ GLDLIBS =-mwindows -lglu32 -lopengl32 -lgdi32 -lcomctl32 -lwsock32
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?
@ -108,5 +111,5 @@ THREADS =threads
$(CXX) -I.. $(CXXFLAGS) $< -c
#
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.8 2002/06/26 12:03:28 easysw Exp $".
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.9 2002/07/08 20:14:06 easysw Exp $".
#

53
makefiles/makeinclude.os2x
View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.os2x,v 1.1.2.4.2.6 2002/03/26 18:47:02 easysw Exp $"
# "$Id: makeinclude.os2x,v 1.1.2.4.2.7 2002/07/08 20:14:07 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# Generated automatically from makeinclude.in by configure.
@ -24,49 +24,52 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
prefix =/usr/local
exec_prefix =${prefix}
bindir =${exec_prefix}/bin
datadir =${prefix}/share
includedir =${prefix}/include
libdir =${exec_prefix}/lib
mandir =${prefix}/man
srcdir =./.
VPATH =./.
prefix = /usr/local
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
datadir = ${prefix}/share
includedir = ${prefix}/include
libdir = ${exec_prefix}/lib
mandir = ${prefix}/man
srcdir = ./.
VPATH = ./.
# programs we use...
HTMLDOC =htmldoc.exe
NROFF =nroff
RM =rm -f
HTMLDOC = htmldoc.exe
NROFF = nroff
RM = rm -f
# compiler names:
CXX =gcc.exe
CC =gcc.exe
MAKEDEPEND =$(CXX) -M
CXX = gcc.exe
CC = gcc.exe
MAKEDEPEND = $(CXX) -M
# flags for C++ compiler:
OPTIM = -O2 -Wall -fno-exceptions
CFLAGS =$(OPTIM) -O4 -mpentium -Zmt
CXXFLAGS =$(OPTIM) -O4 -mpentium -Zmt
CFLAGS = $(OPTIM) -O4 -mpentium -Zmt
CXXFLAGS = $(OPTIM) -O4 -mpentium -Zmt
# program to make the archive:
LIBNAME =../lib/libfltk.a
FLLIBNAME =../lib/libfltk_forms.a
LIBNAME = ../lib/libfltk.a
FLLIBNAME = ../lib/libfltk_forms.a
GLLIBNAME =
LIBCOMMAND =ar.exe cr
RANLIB =ar.exe s
IMGLIBNAME = ../lib/libfltk_images.a
LIBCOMMAND = ar.exe cr
RANLIB = ar.exe s
DSONAME =
FLDSONAME =
GLDSONAME =
IMGDSONAME =
DSOCOMMAND =echo
# libraries to link with:
LDLIBS = -s -Zmt -Zcrtdll -Zbsd-signals -lXext -lX11 -lsocket $(LDFLAGS_MIPSPRO)
GLDLIBS = -s -Zmt -Zcrtdll -Zbsd-signals -lXext -lX11 -lsocket -lshm $(LDFLAGS_MIPSPRO)
LINKFLTK = ../lib/libfltk.a
LINKFLTK = ../lib/libfltk.a
LINKFLTKGL = -L../lib
LINKFLTKFORMS = ../lib/libfltk_forms.a ../lib/libfltk.a
IMAGELIBS =-lpng -ljpeg -lz
LINKFLTKIMG = ../lib/libfltk_images.a ../lib/libfltk.a
IMAGELIBS = -lpng -ljpeg -lz
# Do we build the OpenGL demos?
GLDEMOS =
@ -116,5 +119,5 @@ CAT3EXT =3
mv t.z $@
#
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.6 2002/03/26 18:47:02 easysw Exp $".
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.7 2002/07/08 20:14:07 easysw Exp $".
#