projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/mesa_7_6_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r600
/
Makefile
diff --git
a/src/mesa/drivers/dri/r600/Makefile
b/src/mesa/drivers/dri/r600/Makefile
index d925a2dfe3989cb6ca257ff3bd849170b84d0203..9b7c42042e66c0bb026b50ff93e01792ca81e4ea 100644
(file)
--- a/
src/mesa/drivers/dri/r600/Makefile
+++ b/
src/mesa/drivers/dri/r600/Makefile
@@
-29,6
+29,7
@@
COMMON_SOURCES = \
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_common_context.c \
RADEON_COMMON_SOURCES = \
radeon_bo_legacy.c \
radeon_common_context.c \
+ radeon_buffer_objects.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
radeon_common.c \
radeon_cs_legacy.c \
radeon_dma.c \
@@
-65,8
+66,7
@@
DRIVER_SOURCES = \
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-DRIVER_DEFINES = -DCOMPILE_R600 -DR200_MERGED=0 \
- -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R600 \
+DRIVER_DEFINES = -DRADEON_R600 \
# -DRADEON_BO_TRACK \
-Wall
# -DRADEON_BO_TRACK \
-Wall
@@
-76,4
+76,3
@@
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
include ../Makefile.template
include ../Makefile.template
-symlinks: