diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-28 21:04:37 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-06-28 21:04:37 +0000 |
| commit | 6a6e4ab66c655d2d897c3382a03cd9754257cf01 (patch) | |
| tree | d63153819df5f6528f4a91afea23fe143563f135 /fluid | |
| parent | 96094e5617f0762538b12d5ba3cfead3d809b73c (diff) | |
Separate the extra image functions into fltk_images.
Add new fl_register_images() function to register the extra file formats
with Fl_Shared_Image.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2329 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Makefile | 6 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index d07c2f58d..201043471 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.10.2.6.2.19 2002/05/01 19:35:53 easysw Exp $" +# "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $" # # FLUID makefile for the Fast Light Tool Kit (FLTK). # @@ -54,7 +54,7 @@ include ../makeinclude $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME) echo Linking $@... $(CXX) $(CXXFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTKFORMS) \ - $(IMAGELIBS) $(LDLIBS) + -lfltk_images $(IMAGELIBS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r clean : @@ -89,5 +89,5 @@ rebuild: ./fluid -c widget_panel.fl # -# End of "$Id: Makefile,v 1.10.2.6.2.19 2002/05/01 19:35:53 easysw Exp $". +# End of "$Id: Makefile,v 1.10.2.6.2.20 2002/06/28 21:04:36 easysw Exp $". # diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 4b99572cc..c0573d538 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13.2.27 2002/06/07 15:06:32 easysw Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.28 2002/06/28 21:04:36 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -760,6 +760,7 @@ int main(int argc,char **argv) { return 1; } const char *c = argv[i]; + fl_register_images(); make_main_window(); if (c) set_filename(c); if (!compile_only) { @@ -795,5 +796,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13.2.27 2002/06/07 15:06:32 easysw Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.28 2002/06/28 21:04:36 easysw Exp $". // |