projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[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 fe775eac99a39424d8608165c73f31c8d93ec22a..2245998c952332faea7b1b1c2bc1f0e9c1ba4a4a 100644
(file)
--- a/
src/mesa/drivers/dri/r300/Makefile
+++ b/
src/mesa/drivers/dri/r300/Makefile
@@
-7,14
+7,8
@@
CFLAGS += $(RADEON_CFLAGS)
LIBNAME = r300_dri.so
LIBNAME = r300_dri.so
-MINIGLX_SOURCES = server/radeon_dri.c
-
-ifeq ($(USING_EGL), 1)
-EGL_SOURCES = server/radeon_egl.c
-endif
-
ifeq ($(RADEON_LDFLAGS),)
ifeq ($(RADEON_LDFLAGS),)
-CS_SOURCES = radeon_cs_space_drm.c
+CS_SOURCES = radeon_cs_space_drm.c
radeon_bo.c radeon_cs.c
endif
COMMON_SOURCES = \
endif
COMMON_SOURCES = \
@@
-37,15
+31,19
@@
RADEON_COMMON_SOURCES = \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
radeon_fbo.c \
radeon_lock.c \
radeon_mipmap_tree.c \
- radeon_
span
.c \
+ radeon_
pixel_read
.c \
radeon_queryobj.c \
radeon_queryobj.c \
- radeon_texture.c
+ radeon_span.c \
+ radeon_texture.c \
+ radeon_tex_copy.c \
+ radeon_tex_getimage.c \
+ radeon_tile.c
DRIVER_SOURCES = \
radeon_screen.c \
DRIVER_SOURCES = \
radeon_screen.c \
+ r300_blit.c \
r300_context.c \
r300_draw.c \
r300_context.c \
r300_draw.c \
- r300_ioctl.c \
r300_cmdbuf.c \
r300_state.c \
r300_render.c \
r300_cmdbuf.c \
r300_state.c \
r300_render.c \
@@
-54,6
+52,7
@@
DRIVER_SOURCES = \
r300_vertprog.c \
r300_fragprog_common.c \
r300_shader.c \
r300_vertprog.c \
r300_fragprog_common.c \
r300_shader.c \
+ radeon_mesa_to_rc.c \
r300_emit.c \
r300_swtcl.c \
$(RADEON_COMMON_SOURCES) \
r300_emit.c \
r300_swtcl.c \
$(RADEON_COMMON_SOURCES) \
@@
-64,20
+63,15
@@
C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
DRIVER_DEFINES = -DRADEON_R300
# -DRADEON_BO_TRACK \
DRIVER_DEFINES = -DRADEON_R300
# -DRADEON_BO_TRACK \
- -Wall
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
DRI_LIB_DEPS += $(RADEON_LDFLAGS)
-PIPE_DRIVERS = compiler/libr300compiler.a
+SUBDIRS = compiler
-##### TARGETS #####
+EXTRA_MODULES = compiler/libr300compiler.a
-include ../Makefile.template
-symlinks:
+##### TARGETS #####
-# Mark the archive phony so that we always check for recompilation
-.PHONY : compiler/libr300compiler.a
+include ../Makefile.template
-compiler/libr300compiler.a:
- cd compiler && $(MAKE)