summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2009-07-13 08:32:29 +0300
committerVille Skyttä <ville.skytta@iki.fi>2009-07-13 08:32:29 +0300
commit294e778e92f66570eea390686ba1189bb6821adb (patch)
treece91f602bd625f8cc457d14844d9f452dbf80e18
parent8054fd6d91422f8ff859e2696b10150bc02c998b (diff)
downloadvdr-plugin-text2skin-294e778e92f66570eea390686ba1189bb6821adb.tar.gz
vdr-plugin-text2skin-294e778e92f66570eea390686ba1189bb6821adb.tar.bz2
Compile internal image quantizing code only in Imlib2 builds.
-rw-r--r--HISTORY1
-rw-r--r--Makefile3
-rw-r--r--bitmap.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 1b7480b..03d1b17 100644
--- a/HISTORY
+++ b/HISTORY
@@ -90,6 +90,7 @@ ____-__-__: Version 1.3
fonts are derivatives of some existing ones, they may need to be properly
renamed to something so they will be used instead of the original if it
happens to be installed. (closes #36)
+- Compile internal image quantizing code only in Imlib2 builds.
2009-06-01: Version 1.2
diff --git a/Makefile b/Makefile
index 51a403e..288c72f 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ PACKAGE = vdr-$(ARCHIVE)
OBJS = $(PLUGIN).o loader.o display.o render.o common.o bitmap.o \
file.o i18n.o theme.o cache.o setup.o status.o scroller.o screen.o \
- menu.o font.o quantize.o \
+ menu.o font.o \
\
xml/skin.o xml/parser.o xml/string.o xml/object.o xml/function.o \
xml/type.o xml/display.o xml/xml.o
@@ -73,6 +73,7 @@ ifdef HAVE_IMLIB2
DEFINES += -DHAVE_IMLIB2
INCLUDES += $(shell pkg-config --cflags imlib2)
LIBS += $(shell pkg-config --libs imlib2)
+ OBJS += quantize.o
endif
ifdef HAVE_IMAGEMAGICK
diff --git a/bitmap.c b/bitmap.c
index 3fd0115..9c6b985 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -3,11 +3,11 @@
*/
#include "bitmap.h"
-#include "quantize.h"
#include "setup.h"
#include <vdr/tools.h>
#define X_DISPLAY_MISSING
#ifdef HAVE_IMLIB2
+#include "quantize.h"
#include <Imlib2.h>
#endif
#ifdef HAVE_IMAGEMAGICK