diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-02 22:00:34 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-02 22:00:34 +0000 |
| commit | dcfa6330eddf98e7bd0862b7169070d1d5163f70 (patch) | |
| tree | e5b9831b0faba1a0bf21c48a83f4dd5e21038e12 /vidix | |
| parent | d0dc5cbb6a72ac7563c17a4304cec508c8ef6bc7 (diff) | |
| download | mpv-dcfa6330eddf98e7bd0862b7169070d1d5163f70.tar.bz2 mpv-dcfa6330eddf98e7bd0862b7169070d1d5163f70.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25589 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/Makefile | 15 | ||||
| -rw-r--r-- | vidix/mga_crtc2_vid.c | 3 | ||||
| -rw-r--r-- | vidix/rage128_vid.c | 3 |
3 files changed, 8 insertions, 13 deletions
diff --git a/vidix/Makefile b/vidix/Makefile index a4d14da986..258d0ebaa4 100644 --- a/vidix/Makefile +++ b/vidix/Makefile @@ -14,21 +14,16 @@ SRCS_MPLAYER-$(VIDIX_CYBERBLADE) += cyberblade_vid.c 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 @@ include ../mpcommon.mak $(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) diff --git a/vidix/mga_crtc2_vid.c b/vidix/mga_crtc2_vid.c new file mode 100644 index 0000000000..e55983de4e --- /dev/null +++ b/vidix/mga_crtc2_vid.c @@ -0,0 +1,3 @@ +#define CRTC2 + +#include "mga_vid.c" diff --git a/vidix/rage128_vid.c b/vidix/rage128_vid.c new file mode 100644 index 0000000000..2cd193a6f3 --- /dev/null +++ b/vidix/rage128_vid.c @@ -0,0 +1,3 @@ +#define RAGE128 + +#include "radeon_vid.c" |