summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2013-07-09 09:28:05 +0200
committerRudolf Polzer <divverent@xonotic.org>2013-07-09 09:28:42 +0200
commit1d48b11478b346411d57b8fee1c242591f9b83c5 (patch)
treeaf5bd93e5bc7a3f3a24cc82b846180132bb11dc5
parent7a71a2cc483d17bed94408d5aee6fba6893558cb (diff)
downloadmpv-1d48b11478b346411d57b8fee1c242591f9b83c5.tar.bz2
mpv-1d48b11478b346411d57b8fee1c242591f9b83c5.tar.xz
configure: add libdl detection to ladspa, vf_dlopen
-rw-r--r--Makefile6
-rwxr-xr-xconfigure8
-rw-r--r--video/filter/vf.c2
3 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7dc01f7a3d..a70c845a22 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,11 @@ ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
SOURCES-yes += video/decode/lavc_dr1.c
endif
+SOURCES-$(DL) += video/filter/vf_dlopen.c
+ifeq ($(DL),no)
+ SOURCES-$(WIN32) += video/filter/vf_dlopen.c
+endif
+
SOURCES = talloc.c \
audio/audio.c \
audio/chmap.c \
@@ -248,7 +253,6 @@ SOURCES = talloc.c \
video/filter/vf_crop.c \
video/filter/vf_delogo.c \
video/filter/vf_divtc.c \
- video/filter/vf_dlopen.c \
video/filter/vf_down3dright.c \
video/filter/vf_dsize.c \
video/filter/vf_eq.c \
diff --git a/configure b/configure
index f84cff678d..b6ed81f603 100755
--- a/configure
+++ b/configure
@@ -861,7 +861,9 @@ if darwin; then
_timer=timer-darwin.c
fi
+_win32=no
if win32 ; then
+ _win32=yes
_exesuf=".exe"
extra_cflags="$extra_cflags -fno-common"
# -lwinmm is always needed for osdep/timer-win2.c
@@ -2493,7 +2495,9 @@ echores "$_mpg123"
echocheck "LADSPA plugin support"
if test "$_ladspa" = auto ; then
_ladspa=no
- statement_check ladspa.h 'LADSPA_Descriptor ld = {0}' && _ladspa=yes
+ if test "$_dl" = yes ; then
+ statement_check ladspa.h 'LADSPA_Descriptor ld = {0}' && _ladspa=yes
+ fi
fi
if test "$_ladspa" = yes; then
def_ladspa="#define CONFIG_LADSPA 1"
@@ -2947,6 +2951,7 @@ COCOA = $_cocoa
COREAUDIO = $_coreaudio
COREVIDEO = $_corevideo
DIRECT3D = $_direct3d
+DL = $_dl
SDL = $_sdl
SDL2 = $_sdl2
DSOUND = $_dsound
@@ -2999,6 +3004,7 @@ TV = $_tv
TV_V4L2 = $_tv_v4l2
VCD = $_vcd
VDPAU = $_vdpau
+WIN32 = $_win32
X11 = $_x11
WAYLAND = $_wayland
XV = $_xv
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 0f7cc58ee5..b0c9a7809b 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -109,7 +109,9 @@ static const vf_info_t *const filter_list[] = {
&vf_info_sub,
&vf_info_yadif,
&vf_info_stereo3d,
+#if defined(HAVE_LIBDL) || defined(_WIN32)
&vf_info_dlopen,
+#endif
NULL
};