summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-16 13:28:28 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-11-03 21:59:54 +0100
commit37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (patch)
treeb47d18bee4e7f661d9e6d794dac0ec1cebcd3a37 /video/out/vo.c
parent891a2a1f474add323145e6b2cd2d29181830e4a4 (diff)
downloadmpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.bz2
mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.xz
configure: uniform the defines to #define HAVE_xxx (0|1)
The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 061fc9caf3..737c9c34f9 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -66,47 +66,47 @@ extern struct vo_driver video_out_wayland;
const struct vo_driver *video_out_drivers[] =
{
-#if CONFIG_VDPAU
+#if HAVE_VDPAU
&video_out_vdpau,
#endif
-#ifdef CONFIG_GL
+#if HAVE_GL
&video_out_opengl,
#endif
-#ifdef CONFIG_DIRECT3D
+#if HAVE_DIRECT3D
&video_out_direct3d_shaders,
&video_out_direct3d,
#endif
-#ifdef CONFIG_COREVIDEO
+#if HAVE_COREVIDEO
&video_out_corevideo,
#endif
-#ifdef CONFIG_XV
+#if HAVE_XV
&video_out_xv,
#endif
-#ifdef CONFIG_SDL2
+#if HAVE_SDL2
&video_out_sdl,
#endif
-#ifdef CONFIG_GL
+#if HAVE_GL
&video_out_opengl_old,
#endif
-#if CONFIG_VAAPI
+#if HAVE_VAAPI
&video_out_vaapi,
#endif
-#ifdef CONFIG_X11
+#if HAVE_X11
&video_out_x11,
#endif
&video_out_null,
// should not be auto-selected
&video_out_image,
-#ifdef CONFIG_CACA
+#if HAVE_CACA
&video_out_caca,
#endif
-#ifdef CONFIG_ENCODING
+#if HAVE_ENCODING
&video_out_lavc,
#endif
-#ifdef CONFIG_GL
+#if HAVE_GL
&video_out_opengl_hq,
#endif
-#ifdef CONFIG_WAYLAND
+#if HAVE_WAYLAND
&video_out_wayland,
#endif
NULL