diff options
| author | rofafor <rofafor> | 2008-11-24 10:49:29 +0000 |
|---|---|---|
| committer | rofafor <rofafor> | 2008-11-24 10:49:29 +0000 |
| commit | ab2e9cb34a63bbe4a5db4667c8f039f4886dcdcc (patch) | |
| tree | 4f9ec3faa505ccd17fa9da5d4d52b3b074ecdb79 /Makefile | |
| parent | 6eab8fe15fb007fc0eb9c439293aaa9bf4a37e0f (diff) | |
| download | xineliboutput-ab2e9cb34a63bbe4a5db4667c8f039f4886dcdcc.tar.gz xineliboutput-ab2e9cb34a63bbe4a5db4667c8f039f4886dcdcc.tar.bz2 | |
Replaced cIConv with VDR's cCharConv.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.72 2008-11-20 11:46:30 rofafor Exp $ +# $Id: Makefile,v 1.73 2008-11-24 10:49:29 rofafor Exp $ # # The official name of this plugin. @@ -26,7 +26,6 @@ endif # Override configuration here or in ../../../Make.config # -USE_ICONV = yes #NOSIGNAL_IMAGE_FILE=/usr/share/vdr/xineliboutput/nosignal.mpv #STARTUP_IMAGE_FILE=/usr/share/vdr/xineliboutput/logodisplay.mpv XINELIBOUTPUT_CONFIGURE_OPTS = @@ -183,7 +182,7 @@ LIBS_X11 += -L/usr/X11R6/lib -lXv -lXext ifeq ($(ARCH_APPLE_DARWIN), yes) INCLUDES += -I/sw/include LIBDIRS += -L/sw/lib - LIBS += $(LIBDIRS) -liconv + LIBS += $(LIBDIRS) else LIBS += -lrt endif @@ -196,9 +195,6 @@ ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes) CFLAGS += $(shell (pkg-config libxine --atleast-version=1.1.90 && pkg-config libxine --cflags) || xine-config --cflags) endif -ifeq ($(USE_ICONV), yes) - DEFINES += -DUSE_ICONV=1 -endif ifdef NOSIGNAL_IMAGE_FILE DEFINES += -DNOSIGNAL_IMAGE_FILE='"$(NOSIGNAL_IMAGE_FILE)"' endif |