From ef15655ea34f29eb68b44dbd871e3431df066db0 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Wed, 10 Apr 2002 01:29:45 +0000 Subject: [PATCH] Added (previously omitted) libpng, libjpeg, libtiff, libgif to makedefs in the Linux section --- Make/makedefs | 4 ++++ src/osgPlugins/tiff/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Make/makedefs b/Make/makedefs index 823ac5136..ab27547bf 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -159,6 +159,10 @@ ifeq ($(OS),Linux) X_LIBS = -lXmu -lX11 SOCKET_LIBS = OTHER_LIBS = + PNG_LIBS = -lpng + JPEG_LIBS = -ljpeg + TIFF_LIB = -ltiff + GIF_LIBS = -lgif MAKEDIST = $(TOPDIR)/Make/makerpms endif diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile index 38421e6f6..c42cf575b 100644 --- a/src/osgPlugins/tiff/Makefile +++ b/src/osgPlugins/tiff/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs CXXFILES =\ ReaderWriterTIFF.cpp\ -LIBS += $(TIFF_LIB) $(OSG_LIBS) $(OTHER_LIBS) +LIBS += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS) INC += -I/usr/local/include LDFLAGS += -L/usr/local/lib