From 2a96e38b18218306db3cc520675462754017f5e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 14 Jan 2014 10:49:26 +0100 Subject: [PATCH] Unbundle: libfreeimage from C++ library. --- Makefile.fip | 3 ++- genfipsrclist.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.fip b/Makefile.fip index f4336d2..4831af7 100644 --- a/Makefile.fip +++ b/Makefile.fip @@ -11,7 +11,8 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib # Converts cr/lf to just lf DOS2UNIX = dos2unix -LIBRARIES = -lstdc++ +INCLUDE += -ISource +LIBRARIES = -lstdc++ -lfreeimage-$(VER_MAJOR).$(VER_MINOR) -L. MODULES = $(SRCS:.c=.o) MODULES := $(MODULES:.cpp=.o) diff --git a/genfipsrclist.sh b/genfipsrclist.sh index 0c6eac5..d2aec92 100644 --- a/genfipsrclist.sh +++ b/genfipsrclist.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus" +DIRLIST="Wrapper/FreeImagePlus" echo "VER_MAJOR = 3" > fipMakefile.srcs -- 1.8.2.3