summaryrefslogtreecommitdiff
path: root/test/Makefile
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-06-28 21:04:37 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-06-28 21:04:37 +0000
commit6a6e4ab66c655d2d897c3382a03cd9754257cf01 (patch)
treed63153819df5f6528f4a91afea23fe143563f135 /test/Makefile
parent96094e5617f0762538b12d5ba3cfead3d809b73c (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 'test/Makefile')
-rw-r--r--test/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile
index e2cfa28ee..5e4d0ccb1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.19.2.7.2.36 2002/06/03 12:32:57 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.37 2002/06/28 21:04:37 easysw Exp $"
#
# Test/example program makefile for the Fast Light Tool Kit (FLTK).
#
@@ -223,15 +223,15 @@ doublebuffer$(EXEEXT): doublebuffer.o
editor$(EXEEXT): editor.o
echo Linking $@...
- $(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
+ $(CXX) -I.. $(CXXFLAGS) editor.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
fast_slow$(EXEEXT): fast_slow.o
fast_slow.cxx: fast_slow.fl
-file_chooser$(EXEEXT): file_chooser.o
+file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
echo Linking $@...
- $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
+ $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
fonts$(EXEEXT): fonts.o
@@ -243,9 +243,9 @@ forms$(EXEEXT): forms.o
hello$(EXEEXT): hello.o
-help$(EXEEXT): help.o
+help$(EXEEXT): help.o ../lib/$(LIBFLTKIMG)
echo Linking $@...
- $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
+ $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
iconize$(EXEEXT): iconize.o
@@ -288,7 +288,7 @@ minimum$(EXEEXT): minimum.o
navigation$(EXEEXT): navigation.o
-output$(EXEEXT): output.o
+output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
echo Linking $@...
$(CXX) -I.. $(CXXFLAGS) -o $@ $< $(LINKFLTKFORMS) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
@@ -299,9 +299,9 @@ pack$(EXEEXT): pack.o
pixmap$(EXEEXT): pixmap.o
-pixmap_browser$(EXEEXT): pixmap_browser.o
+pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
echo Linking $@...
- $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTK) $(IMAGELIBS) $(LDLIBS)
+ $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
$(POSTBUILD) $@ ../FL/mac.r
preferences$(EXEEXT): preferences.o
@@ -381,5 +381,5 @@ shape$(EXEEXT): shape.o
#
-# End of "$Id: Makefile,v 1.19.2.7.2.36 2002/06/03 12:32:57 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.37 2002/06/28 21:04:37 easysw Exp $".
#