From f84d94632227ace654d3f9e7e0e4a686ef906483 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sat, 19 Mar 2011 21:20:49 +0800 Subject: android: fix building --- src/gallium/targets/Android.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/gallium/targets/Android.mk') diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index f37ed1e6a2..2101cd3495 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -36,7 +36,6 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_st_mesa \ libmesa_glsl \ libmesa_st_mesa \ - libmesa_talloc \ libmesa_gallium LOCAL_WHOLE_STATIC_LIBRARIES := \ @@ -67,6 +66,17 @@ LOCAL_SHARED_LIBRARIES += \ libdrm_intel endif # MESA_BUILD_I915G +ifeq ($(strip $(MESA_BUILD_R600G)),true) +LOCAL_CFLAGS += -D_EGL_PIPE_R600 +LOCAL_STATIC_LIBRARIES := \ + libmesa_pipe_r600 \ + libmesa_winsys_r600 \ + $(LOCAL_STATIC_LIBRARIES) +LOCAL_SHARED_LIBRARIES += \ + libdrm \ + libdrm_radeon +endif # MESA_BUILD_R600G + LOCAL_MODULE := libGLES_mesa LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl -- cgit v1.2.3