From 2f41430e2e012a2a665cf0f5727eb0839e603966 Mon Sep 17 00:00:00 2001
From: PFO <pfolinux@rdi-linux>
Date: Wed, 1 Jun 2011 12:17:04 +0200
Subject: Adds r300/dri support for GLES_mesa

---
 src/mesa/drivers/Android.mk | 51 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 7 deletions(-)

(limited to 'src/mesa/drivers/Android.mk')

diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index 0b6cd73df3..afa6ced8b8 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -36,6 +36,39 @@ R300_DRIVER_SOURCES = \
 	radeon_mesa_to_rc.c \
 	r300_emit.c \
 	r300_swtcl.c
+R300_DRIVER_DEPEND_SOURCES = \
+	memory_pool.c \
+	r300_fragprog.c \
+	r300_fragprog_emit.c \
+	r300_fragprog_swizzle.c \
+	r3xx_fragprog.c \
+	r3xx_vertprog.c \
+	r3xx_vertprog_dump.c \
+	r500_fragprog.c \
+	r500_fragprog_emit.c \
+	radeon_code.c \
+	radeon_compiler.c \
+	radeon_compiler_util.c \
+	radeon_dataflow.c \
+	radeon_dataflow_deadcode.c \
+	radeon_dataflow_swizzles.c \
+	radeon_emulate_branches.c \
+	radeon_emulate_loops.c \
+	radeon_opcodes.c \
+	radeon_optimize.c \
+	radeon_pair_regalloc.c \
+	radeon_pair_schedule.c \
+	radeon_pair_translate.c \
+	radeon_program_alu.c \
+	radeon_program.c \
+	radeon_program_pair.c \
+	radeon_program_print.c \
+	radeon_program_tex.c \
+	radeon_remove_constants.c \
+	radeon_rename_regs.c
+
+R300_DRIVER_SOURCES := $(addprefix dri/r300/, $(R300_DRIVER_SOURCES))
+R300_DRIVER_DEPEND_SOURCES := $(addprefix dri/r300/compiler/, $(R300_DRIVER_DEPEND_SOURCES))
 
 
 # from dri/i915/Makefile
@@ -269,16 +302,19 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	$(common_SOURCES) \
-	$(R300_DRIVER_SOURCES)
+	$(R300_DRIVER_SOURCES) \
+	$(R300_DRIVER_DEPEND_SOURCES)
 
 LOCAL_CFLAGS := \
 	$(common_CFLAGS) \
-	-DR300
+	-DRADEON_R300 \
+	-std=c99
 
 LOCAL_C_INCLUDES := \
 	$(common_C_INCLUDES) \
-	external/mesa/src/mesa/drivers/dri/intel \
-	external/drm/intel
+	external/mesa/src/mesa/drivers/dri/r300 \
+	external/mesa/src/mesa/drivers/dri/r300/server \
+	external/drm/radeon
 
 LOCAL_STATIC_LIBRARIES := \
 	$(common_STATIC_LIBRARIES)
@@ -287,9 +323,10 @@ LOCAL_SHARED_LIBRARIES := \
 	$(common_SHARED_LIBRARIES) \
 	libdrm_radeon
 
-LOCAL_MODULE := r300_dri
-LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+LOCAL_MODULE := libr300_dri
+#LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(BUILD_STATIC_LIBRARY)
 
-#include $(BUILD_SHARED_LIBRARY)
 endif # MESA_BUILD_R600G
 
-- 
cgit v1.2.3