diff options
author | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
---|---|---|
committer | Hugues Hiegel <hugues@hiegel.fr> | 2011-06-17 16:24:44 +0200 |
commit | 06543d0bbd13f804a6c49f4978a65288211eeebc (patch) | |
tree | e5e60ecae0d95370e788fedea6690910134e436f /src/gallium/targets | |
parent | d58e3fa353c5df8028413837a366a16ff6054015 (diff) | |
parent | 5607823fe4ff35e11086efa6302d8fbacd315b06 (diff) |
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/Android.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index 55cd354a5d..ea35abf4e8 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -66,11 +66,9 @@ LOCAL_SHARED_LIBRARIES += \ libdrm_intel endif # MESA_BUILD_I915G -ifeq ($(strip $(MESA_BUILD_R600G)),true) -LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300 +ifeq ($(strip $(MESA_BUILD_R300)),true) +LOCAL_CFLAGS += -D_EGL_PIPE_R300 LOCAL_STATIC_LIBRARIES := \ - libmesa_pipe_r600 \ - libmesa_winsys_r600 \ libmesa_pipe_r300 \ libmesa_winsys_r300 \ libr300_dri \ @@ -78,6 +76,17 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES += \ libdrm \ libdrm_radeon +endif # MESA_BUILD_R300 + +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 |