summaryrefslogtreecommitdiffstats
path: root/vidix
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-14 10:39:17 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-14 10:39:17 +0000
commitcc5038c8d9875d3e1637278f7b54b6ef7ff19519 (patch)
tree914288db797b23b13f042fefd7e9bdeba52bb45c /vidix
parent720fa4936a0cb04635f1e94369500d903e72de93 (diff)
downloadmpv-cc5038c8d9875d3e1637278f7b54b6ef7ff19519.tar.bz2
mpv-cc5038c8d9875d3e1637278f7b54b6ef7ff19519.tar.xz
added conditional vidix drivers compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22991 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
-rw-r--r--vidix/Makefile24
-rw-r--r--vidix/drivers.c23
2 files changed, 42 insertions, 5 deletions
diff --git a/vidix/Makefile b/vidix/Makefile
index 9f256a18ce..712c86e5b9 100644
--- a/vidix/Makefile
+++ b/vidix/Makefile
@@ -3,15 +3,29 @@ include ../config.mak
LIBNAME_MPLAYER = libvidix.a
SRCS_MPLAYER = vidixlib.c \
+ drivers.c \
dha.c \
mtrr.c \
pci.c \
pci_names.c \
- pci_dev_ids.c \
- $(wildcard *.c)
-
-OBJS_MPLAYER = mga_crtc2_vid.o \
- rage128_vid.o \
+ pci_dev_ids.c
+
+SRCS_MPLAYER-$(CONFIG_VIDIX_CYBERBLADE) += cyberblade_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_MACH64) += mach64_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_MGA) += mga_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_NVIDIA) += nvidia_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_PM3) += pm3_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_RADEON) += radeon_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_SAVAGE) += savage_vid.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_SIS) += sis_vid.c sis_bridge.c
+SRCS_MPLAYER-$(CONFIG_VIDIX_UNICHROME) += unichrome_vid.c
+
+ifeq ($(CONFIG_VIDIX_MGA_CRTC2), yes)
+OBJS_MPLAYER += mga_crtc2_vid.o
+endif
+ifeq ($(CONFIG_VIDIX_RAGE128),yes)
+OBJS_MPLAYER += rage128_vid.o
+endif
# If you want libdha to use svgalib_helper for hardware access,
# uncomment this statement, and change the -I to the correct directory
diff --git a/vidix/drivers.c b/vidix/drivers.c
index a0f8afb82e..da33ebb291 100644
--- a/vidix/drivers.c
+++ b/vidix/drivers.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "libavutil/common.h"
#include "mpbswap.h"
+#include "config.h"
VDXDriver *first_driver = NULL;
@@ -54,17 +55,39 @@ static void vidix_register_driver (VDXDriver *drv)
void vidix_register_all_drivers (void)
{
+#ifdef CONFIG_VIDIX_DRV_CYBERBLADE
vidix_register_driver (&cyberblade_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_MACH64
vidix_register_driver (&mach64_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_MGA
vidix_register_driver (&mga_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_MGA_CRTC2
vidix_register_driver (&mga_crtc2_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_NVIDIA
vidix_register_driver (&nvidia_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_PM3
vidix_register_driver (&pm3_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_RADEON
vidix_register_driver (&radeon_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_RAGE128
vidix_register_driver (&rage128_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_SAVAGE
vidix_register_driver (&savage_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_SIS
vidix_register_driver (&sis_drv);
+#endif
+#ifdef CONFIG_VIDIX_DRV_UNICHROME
vidix_register_driver (&unichrome_drv);
+#endif
}
static int vidix_probe_driver (VDXContext *ctx, VDXDriver *drv,