Mercurial > mplayer.hg
changeset 25561:1e215be6a749
Get rid of build system hackery to generate mga_crtc2_vid.o and rage128_vid.o.
Instead, create files that #include mga_vid.c/radeon_vid.c with the proper
#defines set. This has the added benefit of fixing dependency generation,
which only works for existing .c files.
| author | diego |
|---|---|
| date | Wed, 02 Jan 2008 22:00:34 +0000 |
| parents | 4627866e3697 |
| children | fd4b42040150 |
| files | vidix/Makefile vidix/mga_crtc2_vid.c vidix/rage128_vid.c |
| diffstat | 3 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/Makefile Wed Jan 02 21:50:30 2008 +0000 +++ b/vidix/Makefile Wed Jan 02 22:00:34 2008 +0000 @@ -14,21 +14,16 @@ SRCS_MPLAYER-$(VIDIX_IVTV) += ivtv_vid.c SRCS_MPLAYER-$(VIDIX_MACH64) += mach64_vid.c SRCS_MPLAYER-$(VIDIX_MGA) += mga_vid.c +SRCS_MPLAYER-$(VIDIX_MGA_CRTC2) += mga_crtc2_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_RAGE128) += rage128_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 ($(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 # that includes svgalib_helper.o: @@ -44,12 +39,6 @@ $(OBJS_MPLAYER): $(PCI_FILES) -mga_crtc2_vid.o: mga_vid.c - $(CC) -c $(CFLAGS) -DCRTC2 -o $@ $< - -rage128_vid.o: radeon_vid.c - $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< - $(PCI_FILES): pci.db LC_ALL=C awk -f pci_db2c.awk $< $(VIDIX_PCIDB)