diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 01:09:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 01:09:49 +0000 |
| commit | a6b935289ed59305318929b857bf74f671125e87 (patch) | |
| tree | 20398a4cc1c49f2309b0b607e331aea2c433e17b /src/Makefile | |
| parent | 27a54dc22bb9b2fbb16b01a04cd8479d25470bec (diff) | |
Move the rest of the image file formats (except for XBM and XPM) to
the fltk_images library; saves about 16k in the FLTK core library on my
Intel system.
Fix a memory leak bug in most of the fl_set_fonts*.cxx implementations;
as a result, the Fl_Fontdesc structure now has a fontname member to old
the human-readable font name.
Lots of fixes for shadowed variables, etc.
Use snprintf, strlcpy, and strlcat in more places.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2566 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index 1e4892615..419cd6680 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.18.2.14.2.46 2002/07/14 17:03:31 easysw Exp $" +# "$Id: Makefile,v 1.18.2.14.2.47 2002/08/09 01:09:49 easysw Exp $" # # Library makefile for the Fast Light Tool Kit (FLTK). # @@ -27,7 +27,6 @@ CPPFILES = \ Fl.cxx \ Fl_Adjuster.cxx \ Fl_Bitmap.cxx \ - Fl_BMP_Image.cxx \ Fl_Browser.cxx \ Fl_Browser_.cxx \ Fl_Browser_load.cxx \ @@ -47,7 +46,6 @@ CPPFILES = \ Fl_File_Chooser2.cxx \ Fl_File_Icon.cxx \ Fl_File_Input.cxx \ - Fl_GIF_Image.cxx \ Fl_Group.cxx \ Fl_Help_Dialog.cxx \ Fl_Help_View.cxx \ @@ -66,7 +64,6 @@ CPPFILES = \ Fl_Overlay_Window.cxx \ Fl_Pack.cxx \ Fl_Pixmap.cxx \ - Fl_PNM_Image.cxx \ Fl_Positioner.cxx \ Fl_Preferences.cxx \ Fl_Progress.cxx \ @@ -170,9 +167,12 @@ GLCPPFILES = \ IMGCPPFILES = \ fl_images_core.cxx \ + Fl_BMP_Image.cxx \ Fl_File_Icon2.cxx \ + Fl_GIF_Image.cxx \ Fl_JPEG_Image.cxx \ - Fl_PNG_Image.cxx + Fl_PNG_Image.cxx \ + Fl_PNM_Image.cxx CFILES = fl_call_main.c flstring.c scandir.c numericsort.c vsnprintf.c @@ -565,5 +565,5 @@ uninstall: # -# End of "$Id: Makefile,v 1.18.2.14.2.46 2002/07/14 17:03:31 easysw Exp $". +# End of "$Id: Makefile,v 1.18.2.14.2.47 2002/08/09 01:09:49 easysw Exp $". # |