diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-06 00:18:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-06 00:18:49 +0000 |
| commit | 388a864ef72fee59c80239209c770878f27d92ab (patch) | |
| tree | 24ceae1b21196f8d8bb04151b79ac5233aa389c3 /makeinclude.in | |
| parent | c1525a2062342c6519f996200fb9ba4480a32307 (diff) | |
Makefile and configure script support for image libs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3644 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'makeinclude.in')
| -rw-r--r-- | makeinclude.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/makeinclude.in b/makeinclude.in index 4983d6875..349ba508b 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -1,8 +1,7 @@ # -# "$Id: makeinclude.in,v 1.7.2.11.2.26 2004/04/11 04:38:53 easysw Exp $" +# "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). -# @configure_input@ # # Copyright 1998-2004 by Bill Spitzak and others. # @@ -79,6 +78,9 @@ LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS) LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) IMAGELIBS = @IMAGELIBS@ +# image libraries to build... +IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@ + # The extension to use for executables... EXEEXT = @EXEEXT@ @@ -106,16 +108,16 @@ CAT3EXT = @CAT3EXT@ .o$(EXEEXT): echo Linking $@... - $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r .c.o: echo Compiling $<... - $(CC) -I.. $(CFLAGS) -c $< + $(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< .cxx.o: echo Compiling $<... - $(CXX) -I.. $(CXXFLAGS) -c $< + $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< .man.0 .man.1 .man.3: echo Formatting $<... @@ -130,5 +132,5 @@ CAT3EXT = @CAT3EXT@ mv t.z $@ # -# End of "$Id: makeinclude.in,v 1.7.2.11.2.26 2004/04/11 04:38:53 easysw Exp $". +# End of "$Id: makeinclude.in,v 1.7.2.11.2.27 2004/07/06 00:18:48 easysw Exp $". # |