From 063094f442c0ac3c592d2e5bb5c416d6820d2602 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 7 Feb 2013 14:25:09 +0100 Subject: [PATCH] Adapted makefile for new imagemagick versions --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c2c236..df0ba33 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,13 @@ SOFILE = libvdr-$(PLUGIN).so ### Includes and Defines (add further entries here): -INCLUDES += -INCLUDES += -I/usr/include/ImageMagick +INCLUDES += $(shell pkg-config --cflags-only-I Magick++) DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DMAGICKCORE_HDRI_ENABLE=0 +DEFINES += -DMAGICKCORE_QUANTUM_DEPTH=16 + +LIBS += $(shell pkg-config --libs Magick++) ### The object files (add further files here): @@ -98,7 +101,7 @@ install-i18n: $(I18Nmsgs) ### Targets: $(SOFILE): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lMagick++ -o $@ + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@ install-lib: $(SOFILE) install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)