summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 18:33:39 +0200
committerwm4 <wm4@nowhere>2013-07-12 18:33:39 +0200
commitdc95504a52fc09be96a92b6cf2d9643ad4363db6 (patch)
treea7220deb3eb7cbe198d359c8cf24be25e3f007e5
parentd176f9571f22bc3b007f97544732698cec85a36e (diff)
downloadmpv-dc95504a52fc09be96a92b6cf2d9643ad4363db6.tar.bz2
mpv-dc95504a52fc09be96a92b6cf2d9643ad4363db6.tar.xz
build: change vf_dlopen test
Didn't work on Windows. Apparently, WIN32 is not set in the Makefile.
-rw-r--r--Makefile5
-rwxr-xr-xconfigure14
-rw-r--r--video/filter/vf.c2
3 files changed, 16 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a70c845a22..c3638c865f 100644
--- a/Makefile
+++ b/Makefile
@@ -116,10 +116,7 @@ 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-$(DLOPEN) += video/filter/vf_dlopen.c
SOURCES = talloc.c \
audio/audio.c \
diff --git a/configure b/configure
index 9f4439dfae..49c9625294 100755
--- a/configure
+++ b/configure
@@ -2842,6 +2842,18 @@ fi
echores "$_encoding"
+# needs dlopen on unix, uses winapi on windows
+_dlopen="$_dl"
+if win32 ; then
+ _dlopen=yes
+fi
+
+if test "$_dlopen" = yes ; then
+ def_dlopen='#define CONFIG_DLOPEN 1'
+else
+ def_dlopen='#undef CONFIG_DLOPEN'
+fi
+
#############################################################################
echocheck "compiler support for noexecstack"
@@ -2966,6 +2978,7 @@ COREAUDIO = $_coreaudio
COREVIDEO = $_corevideo
DIRECT3D = $_direct3d
DL = $_dl
+DLOPEN = $_dlopen
SDL = $_sdl
SDL2 = $_sdl2
DSOUND = $_dsound
@@ -3126,6 +3139,7 @@ $def_libavfilter
$def_vf_lavfi
$def_af_lavfi
+$def_dlopen
/* Audio output drivers */
$def_alsa
diff --git a/video/filter/vf.c b/video/filter/vf.c
index b0c9a7809b..1402ad3efc 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -109,7 +109,7 @@ static const vf_info_t *const filter_list[] = {
&vf_info_sub,
&vf_info_yadif,
&vf_info_stereo3d,
-#if defined(HAVE_LIBDL) || defined(_WIN32)
+#ifdef CONFIG_DLOPEN
&vf_info_dlopen,
#endif
NULL