R1xx/r2xx: Don't use an alpha texture format for GLX_TEXTURE_FORMAT_RGB_EXT

[mesa.git] / src / mesa / drivers / dri / r200 / Makefile

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index a2aeeb5a9453de708436066b2e814d6e24ea11aa..6a246edf7cb0ea88474c53d1bf770a82e9713f6b 100644 (file)
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -3,60 +3,105 @@
 TOP = ../../../../..
 include $(TOP)/configs/current
 
+CFLAGS += $(RADEON_CFLAGS)
+
 LIBNAME = r200_dri.so
 
 MINIGLX_SOURCES = server/radeon_dri.c 
 
-COMMON_SOURCES = \
-       ../../common/driverfuncs.c \
-       ../common/mm.c \
-       ../common/utils.c \
-       ../common/texmem.c \
-       ../common/vblank.c \
-       ../common/xmlconfig.c \
-       ../common/dri_util.c \
-       ../common/glcontextmodes.c
+ifeq ($(USING_EGL), 1)
+EGL_SOURCES = server/radeon_egl.c
+endif
+
+RADEON_COMMON_SOURCES = \
+       radeon_texture.c \
+       radeon_common_context.c \
+       radeon_common.c \
+       radeon_dma.c \
+       radeon_lock.c \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_mipmap_tree.c \
+       radeon_span.c \
+       radeon_fbo.c
+
 
 DRIVER_SOURCES = r200_context.c \
                 r200_ioctl.c \
-                r200_lock.c \
-                r200_screen.c \
                 r200_state.c \
                 r200_state_init.c \
                 r200_cmdbuf.c \
                 r200_pixel.c \
                 r200_tex.c \
-                r200_texmem.c \
                 r200_texstate.c \
                 r200_tcl.c \
                 r200_swtcl.c \
-                r200_span.c \
                 r200_maos.c \
                 r200_sanity.c \
-                r200_vtxfmt.c \
-                r200_vtxfmt_c.c \
-                r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c 
+                r200_fragshader.c \
+                r200_vertprog.c \
+                radeon_screen.c \
+                $(EGL_SOURCES) \
+                $(RADEON_COMMON_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-X86_SOURCES = r200_vtxtmp_x86.S
+X86_SOURCES = 
+
+DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
 
 SYMLINKS = \
-       server/radeon_dri.c \
+       server/radeon_egl.c  \
+       server/radeon_dri.c  \
        server/radeon_dri.h \
        server/radeon.h \
        server/radeon_macros.h \
-       server/radeon_reg.h 
+       server/radeon_reg.h
+
+COMMON_SYMLINKS = \
+       radeon_chipset.h \
+       radeon_screen.c \
+       radeon_screen.h \
+       radeon_bo_legacy.c \
+       radeon_cs_legacy.c \
+       radeon_bo_legacy.h \
+       radeon_cs_legacy.h \
+       radeon_bocs_wrapper.h \
+       radeon_span.h \
+       radeon_span.c \
+       radeon_lock.c \
+       radeon_lock.h \
+       radeon_common.c \
+       radeon_common_context.c \
+       radeon_common_context.h \
+       radeon_common.h \
+       radeon_cmdbuf.h \
+       radeon_mipmap_tree.c \
+       radeon_mipmap_tree.h \
+       radeon_texture.c \
+       radeon_texture.h \
+       radeon_dma.c \
+       radeon_dma.h \
+       radeon_fbo.c
+
+DRI_LIB_DEPS += $(RADEON_LDFLAGS)
 
 ##### TARGETS #####
 
 
 include ../Makefile.template
 
-$(SYMLINKS):
+#INCLUDES += -I../radeon/server
+
+server:
        mkdir -p server
-       for i in $(SYMLINKS) ; do rm -f $$i && test -f ../radeon/$$i && ln -s ../../radeon/$$i $$i ; done
 
-symlinks: $(SYMLINKS)
+$(SYMLINKS): server
+       @[ -e $@ ] || ln -sf ../../radeon/$@ server/
+
+
+$(COMMON_SYMLINKS):
+       @[ -e $@ ] || ln -sf ../radeon/$@ ./
+
+symlinks: $(SYMLINKS) $(COMMON_SYMLINKS)