r500: fragprog

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

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index fdd5b732f2a7df2222bfae23a38ae94c1a7e7194..5b2bd0bc2b005432252c78622eb00420d419222d 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -1,14 +1,16 @@
 # src/mesa/drivers/dri/r300/Makefile
 
-
 TOP = ../../../../..
 include $(TOP)/configs/current
 
 LIBNAME = r300_dri.so
-DEFINES += -DCOMPILE_R300
 
 MINIGLX_SOURCES = server/radeon_dri.c
 
+ifeq ($(USING_EGL), 1)
+EGL_SOURCES = server/radeon_egl.c
+endif
+
 COMMON_SOURCES = \
        ../../common/driverfuncs.c \
        ../common/mm.c \
@@ -16,8 +18,7 @@ COMMON_SOURCES = \
        ../common/texmem.c \
        ../common/vblank.c \
        ../common/xmlconfig.c \
-       ../common/dri_util.c \
-       ../common/glcontextmodes.c
+       ../common/dri_util.c
 
 DRIVER_SOURCES = \
                 radeon_screen.c \
@@ -26,6 +27,7 @@ DRIVER_SOURCES = \
                 radeon_lock.c \
                 radeon_span.c \
                 radeon_state.c \
+                r300_mem.c \
                 \
                 r300_context.c \
                 r300_ioctl.c \
@@ -35,45 +37,44 @@ DRIVER_SOURCES = \
                 r300_texmem.c \
                 r300_tex.c \
                 r300_texstate.c \
-                \
-                r200_context.c \
-                r200_ioctl.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_maos.c \
-                r200_sanity.c \
-                r200_vtxfmt.c \
-                r200_vtxfmt_c.c \
-                r200_vtxfmt_sse.c \
-                r200_vtxfmt_x86.c
-
+                r300_vertprog.c \
+                r300_fragprog.c \
+                r500_fragprog.c \
+                r300_shader.c \
+                r300_emit.c \
+                r300_swtcl.c \
+                $(EGL_SOURCES)
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-X86_SOURCES = r200_vtxtmp_x86.S
+DRIVER_DEFINES = -DCOMPILE_R300 -DR200_MERGED=0 \
+       -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
 
 SYMLINKS = \
        server/radeon_dri.c \
        server/radeon_dri.h \
        server/radeon.h \
        server/radeon_macros.h \
-       server/radeon_reg.h
+       server/radeon_reg.h \
+       server/radeon_egl.c
 
-##### TARGETS #####
+COMMON_SYMLINKS = \
+       radeon_chipset.h \
+       radeon_screen.c \
+       radeon_screen.h \
+       radeon_span.h
 
+##### TARGETS #####
 
 include ../Makefile.template
 
-$(SYMLINKS):
+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)