mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BMP image loader fixes. 

JPEG with Cygwin fix.

Make sure that all generated files are removed with a "make distclean".

Make sure we remove the autoconf cache directory when building the
source distribution.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2551 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-07-26 14:22:02 +00:00
parent 7ce42e2592
commit 1cfc6385dd
6 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,6 +1,10 @@
CHANGES IN FLTK 1.1.0
- Documentation updates.
- Fl_JPEG_Image didn't compile out-of-the-box with Cygwin
due to a bug in the Cygwin JPEG library headers.
- Fl_BMP_Image still didn't work with some old BMP files.
- "make distclean" didn't really clean out everything.
- Tweeked the look of the check button with a patch from
Albrecht Schlosser.

31
Makefile
View File

@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.12.2.6.2.11 2002/05/01 19:35:53 easysw Exp $"
# "$Id: Makefile,v 1.12.2.6.2.12 2002/07/26 14:22:01 easysw Exp $"
#
# Top-level makefile for the Fast Light Tool Kit (FLTK).
#
@ -25,47 +25,54 @@
include makeinclude
SHELL = /bin/sh
DIRS = src fluid test documentation
all: makeinclude
@for dir in $(DIRS); do\
for dir in $(DIRS); do\
echo "=== making $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
done
install: makeinclude
-mkdir -p $(bindir)
rm -f $(bindir)/fltk-config
$(RM) $(bindir)/fltk-config
-cp fltk-config $(bindir)
-chmod 755 $(bindir)/fltk-config
@for dir in FL $(DIRS); do\
for dir in FL $(DIRS); do\
echo "=== installing $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
done
uninstall: makeinclude
rm -f $(bindir)/fltk-config
@for dir in FL $(DIRS); do\
$(RM) $(bindir)/fltk-config
for dir in FL $(DIRS); do\
echo "=== uninstalling $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
done
depend: makeinclude
@for dir in $(DIRS); do\
for dir in $(DIRS); do\
echo "=== making dependencies in $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\
done
clean:
-@ rm -f core *.o
@for dir in $(DIRS); do\
-$(RM) core *.o
for dir in $(DIRS); do\
echo "=== cleaning $$dir ===";\
(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\
done
distclean: clean
rm -f config.* makeinclude
-$(RM) config.*
$(RM) fltk-config fltk.list makeinclude
$(RM) FL/Makefile
$(RM) doc/*.$(CAT1EXT) doc/*.$(CAT3EXT)
$(RM) -r doc/fltk.pdf doc/fltk.ps doc/fltk.d
for file in test/*.fl; do\
$(RM) `basename $file .fl`.cxx; \
$(RM) `basename $file .fl`.h; \
done
makeinclude: configure configh.in makeinclude.in
if test -f config.status; then \
@ -87,5 +94,5 @@ native-dist:
#
# End of "$Id: Makefile,v 1.12.2.6.2.11 2002/05/01 19:35:53 easysw Exp $".
# End of "$Id: Makefile,v 1.12.2.6.2.12 2002/07/26 14:22:01 easysw Exp $".
#

5
makeinclude.in
View File

@ -1,5 +1,5 @@
#
# "$Id: makeinclude.in,v 1.7.2.11.2.21 2002/07/15 23:38:11 easysw Exp $"
# "$Id: makeinclude.in,v 1.7.2.11.2.22 2002/07/26 14:22:02 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@
@ -43,6 +43,7 @@ MKDIR = mkdir -p
NROFF = @NROFF@
RM = rm -f
RMDIR = rm -rf
SHELL = /bin/sh
STRIP = strip
# compiler names:
@ -129,5 +130,5 @@ CAT3EXT = @CAT3EXT@
mv t.z $@
#
# End of "$Id: makeinclude.in,v 1.7.2.11.2.21 2002/07/15 23:38:11 easysw Exp $".
# End of "$Id: makeinclude.in,v 1.7.2.11.2.22 2002/07/26 14:22:02 easysw Exp $".
#

2
makesrcdist
View File

@ -38,7 +38,7 @@ echo "Removing CVS directories..."
rm -rf CVS */CVS */*/CVS
rm -rf .cvsignore */.cvsignore */*/.cvsignore
rm -rf OpenGL autom4te bc5 config forms gl glut images packages themes
rm -rf OpenGL autom4te* bc5 config forms gl glut images packages themes
rm makesrcdist
cd ..

6
src/Fl_BMP_Image.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $"
// "$Id: Fl_BMP_Image.cxx,v 1.1.2.8 2002/07/26 14:22:02 easysw Exp $"
//
// Fl_BMP_Image routines.
//
@ -111,7 +111,7 @@ Fl_BMP_Image::Fl_BMP_Image(const char *bmp) // I - File to read
compression = BI_RGB;
colors_used = 0;
count = info_size - 8;
count = info_size - 12;
} else {
// New BMP header...
w(read_long(fp));
@ -393,5 +393,5 @@ read_long(FILE *fp) { // I - File to read from
//
// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.7 2002/06/24 02:04:54 easysw Exp $".
// End of "$Id: Fl_BMP_Image.cxx,v 1.1.2.8 2002/07/26 14:22:02 easysw Exp $".
//

15
src/Fl_JPEG_Image.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.5 2002/05/25 02:56:59 easysw Exp $"
// "$Id: Fl_JPEG_Image.cxx,v 1.1.2.6 2002/07/26 14:22:02 easysw Exp $"
//
// Fl_JPEG_Image routines.
//
@ -25,6 +25,7 @@
//
// Contents:
//
// Fl_JPEG_Image::Fl_JPEG_Image() - Load a JPEG image file.
//
//
@ -36,6 +37,16 @@
#include <stdio.h>
#include <stdlib.h>
// Some releases of the Cygwin JPEG libraries don't have a correctly
// updated header file for the INT32 data type; the following define
// from Shane Hill seems to be a usable workaround...
#if defined(WIN32) && defined(__CYGWIN__)
# define XMD_H
#endif // WIN32 && __CYGWIN__
extern "C"
{
#ifdef HAVE_LIBJPEG
@ -96,5 +107,5 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *jpeg) // I - File to load
}
//
// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.5 2002/05/25 02:56:59 easysw Exp $".
// End of "$Id: Fl_JPEG_Image.cxx,v 1.1.2.6 2002/07/26 14:22:02 easysw Exp $".
//