projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
[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 2114ce55c14d6dd10f46c907b93c7f1692f4cd81..776f1e3f3f77b30b044cc8b1bd20944e22a534b2 100644
(file)
--- a/
src/mesa/drivers/dri/r200/Makefile
+++ b/
src/mesa/drivers/dri/r200/Makefile
@@
-18,17
+18,18
@@
CS_SOURCES = radeon_cs_space_drm.c
endif
RADEON_COMMON_SOURCES = \
endif
RADEON_COMMON_SOURCES = \
- radeon_
texture
.c \
+ radeon_
bo_legacy
.c \
radeon_common_context.c \
radeon_common.c \
radeon_common_context.c \
radeon_common.c \
+ radeon_cs_legacy.c \
radeon_dma.c \
radeon_dma.c \
+ radeon_debug.c \
+ radeon_fbo.c \
radeon_lock.c \
radeon_lock.c \
- radeon_bo_legacy.c \
- radeon_cs_legacy.c \
radeon_mipmap_tree.c \
radeon_mipmap_tree.c \
+ radeon_queryobj.c \
radeon_span.c \
radeon_span.c \
- radeon_fbo.c \
- radeon_queryobj.c
+ radeon_texture.c
DRIVER_SOURCES = r200_context.c \
DRIVER_SOURCES = r200_context.c \
@@
-54,7
+55,7
@@
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
X86_SOURCES =
X86_SOURCES =
-DRIVER_DEFINES = -DRADEON_
COMMON=1 -DRADEON_COMMON_FOR_R200
+DRIVER_DEFINES = -DRADEON_
R200 -Wall
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
@@
-65,4
+66,3
@@
include ../Makefile.template
#INCLUDES += -I../radeon/server
#INCLUDES += -I../radeon/server
-symlinks: