projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300: Last of the indent changes. :)
[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 02ef3214776c39eefff01a6fdc805d2ded423dfd..65a6b03b741e7f26fe95a17af6908a28295a84ff 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
# src/mesa/drivers/dri/r300/Makefile
-
TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = r300_dri.so
TOP = ../../../../..
include $(TOP)/configs/current
LIBNAME = r300_dri.so
-DEFINES += -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0
MINIGLX_SOURCES = server/radeon_dri.c
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 \
COMMON_SOURCES = \
../../common/driverfuncs.c \
../common/mm.c \
@@
-25,6
+27,8
@@
DRIVER_SOURCES = \
radeon_lock.c \
radeon_span.c \
radeon_state.c \
radeon_lock.c \
radeon_span.c \
radeon_state.c \
+ radeon_mm.c \
+ radeon_vtxfmt_a.c \
\
r300_context.c \
r300_ioctl.c \
\
r300_context.c \
r300_ioctl.c \
@@
-34,34
+38,16
@@
DRIVER_SOURCES = \
r300_texmem.c \
r300_tex.c \
r300_texstate.c \
r300_texmem.c \
r300_tex.c \
r300_texstate.c \
- r300_texprog.c \
- r300_vertexprog.c \
+ r300_vertprog.c \
r300_fragprog.c \
r300_shader.c \
r300_fragprog.c \
r300_shader.c \
- r300_maos.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_swtcl.c \
-# r200_maos.c \
-# r200_sanity.c \
-# r200_vtxfmt.c \
-# r200_vtxfmt_c.c \
-# r200_vtxfmt_sse.c \
-# r200_vtxfmt_x86.c
-
+ r300_maos.c \
+ $(EGL_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-X86_SOURCES =
-#r200_vtxtmp_x86.S
+DRIVER_DEFINES = -DCOMPILE_R300 -DGLX_DIRECT_RENDERING -DR200_MERGED=0 \
+ -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300
SYMLINKS = \
server/radeon_dri.c \
SYMLINKS = \
server/radeon_dri.c \
@@
-71,14
+57,22
@@
SYMLINKS = \
server/radeon_reg.h \
server/radeon_egl.c
server/radeon_reg.h \
server/radeon_egl.c
-##### TARGETS #####
+COMMON_SYMLINKS = \
+ radeon_chipset.h \
+ radeon_screen.c \
+ radeon_screen.h
+##### TARGETS #####
include ../Makefile.template
include ../Makefile.template
-
$(SYMLINKS)
:
+
server
:
mkdir -p 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)