diff options
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | vidix/Makefile | 26 |
2 files changed, 25 insertions, 25 deletions
@@ -7805,18 +7805,18 @@ CONFIG_ENCODERS=$_mencoder CONFIG_MUXERS=$_mencoder RADIO=$_radio RADIO_CAPTURE=$_radio_capture -CONFIG_VIDIX_CYBERBLADE=$_vidix_drv_cyberblade -CONFIG_VIDIX_MACH64=$_vidix_drv_mach64 -CONFIG_VIDIX_MGA=$_vidix_drv_mga -CONFIG_VIDIX_MGA_CRTC2=$_vidix_drv_mga_crtc2 -CONFIG_VIDIX_NVIDIA=$_vidix_drv_nvidia -CONFIG_VIDIX_PM2=$_vidix_drv_pm2 -CONFIG_VIDIX_PM3=$_vidix_drv_pm3 -CONFIG_VIDIX_RADEON=$_vidix_drv_radeon -CONFIG_VIDIX_RAGE128=$_vidix_drv_rage128 -CONFIG_VIDIX_SAVAGE=$_vidix_drv_savage -CONFIG_VIDIX_SIS=$_vidix_drv_sis -CONFIG_VIDIX_UNICHROME=$_vidix_drv_unichrome +VIDIX_CYBERBLADE=$_vidix_drv_cyberblade +VIDIX_MACH64=$_vidix_drv_mach64 +VIDIX_MGA=$_vidix_drv_mga +VIDIX_MGA_CRTC2=$_vidix_drv_mga_crtc2 +VIDIX_NVIDIA=$_vidix_drv_nvidia +VIDIX_PM2=$_vidix_drv_pm2 +VIDIX_PM3=$_vidix_drv_pm3 +VIDIX_RADEON=$_vidix_drv_radeon +VIDIX_RAGE128=$_vidix_drv_rage128 +VIDIX_SAVAGE=$_vidix_drv_savage +VIDIX_SIS=$_vidix_drv_sis +VIDIX_UNICHROME=$_vidix_drv_unichrome # --- Some stuff for autoconfigure ---- $_target_arch diff --git a/vidix/Makefile b/vidix/Makefile index f9f04c4894..0f6ea6a5d4 100644 --- a/vidix/Makefile +++ b/vidix/Makefile @@ -10,21 +10,21 @@ SRCS_MPLAYER = vidixlib.c \ pci_names.c \ 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_PM2) += pm2_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) +SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += cyberblade_vid.c +SRCS_MPLAYER-$(VIDIX_MACH64) += mach64_vid.c +SRCS_MPLAYER-$(VIDIX_MGA) += mga_vid.c +SRCS_MPLAYER-$(VIDIX_NVIDIA) += nvidia_vid.c +SRCS_MPLAYER-$(VIDIX_PM2) += pm2_vid.c +SRCS_MPLAYER-$(VIDIX_PM3) += pm3_vid.c +SRCS_MPLAYER-$(VIDIX_RADEON) += radeon_vid.c +SRCS_MPLAYER-$(VIDIX_SAVAGE) += savage_vid.c +SRCS_MPLAYER-$(VIDIX_SIS) += sis_vid.c sis_bridge.c +SRCS_MPLAYER-$(VIDIX_UNICHROME) += unichrome_vid.c + +ifeq ($(VIDIX_MGA_CRTC2), yes) OBJS_MPLAYER += mga_crtc2_vid.o endif -ifeq ($(CONFIG_VIDIX_RAGE128),yes) +ifeq ($(VIDIX_RAGE128),yes) OBJS_MPLAYER += rage128_vid.o endif |