diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2011-03-19 21:20:49 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2011-03-25 03:30:43 +0800 |
| commit | f84d94632227ace654d3f9e7e0e4a686ef906483 (patch) | |
| tree | 4eef3995ac38f7fb4cde46624000d1d8b02e9543 /src/gallium | |
| parent | 66c6b2520d0b51b51e9632146db92ab4cad30762 (diff) | |
android: fix building
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/Android.mk | 43 | ||||
| -rw-r--r-- | src/gallium/state_trackers/Android.mk | 1 | ||||
| -rw-r--r-- | src/gallium/targets/Android.mk | 12 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/Android.mk | 38 |
4 files changed, 93 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk new file mode 100644 index 0000000000..b76a78810f --- /dev/null +++ b/src/gallium/drivers/r600/Android.mk @@ -0,0 +1,43 @@ +ifeq ($(strip $(MESA_BUILD_R600G)),true) + +LOCAL_PATH := $(call my-dir) + +# from Makefile +C_SOURCES = \ + r600_asm.c \ + r600_blit.c \ + r600_buffer.c \ + r600_helper.c \ + r600_pipe.c \ + r600_query.c \ + r600_resource.c \ + r600_shader.c \ + r600_state.c \ + r600_texture.c \ + r700_asm.c \ + evergreen_state.c \ + eg_asm.c \ + r600_translate.c \ + r600_state_common.c + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(C_SOURCES) + +LOCAL_CFLAGS := \ + -std=c99 \ + -fvisibility=hidden \ + -Wno-sign-compare + +LOCAL_C_INCLUDES := \ + external/mesa/src/gallium/include \ + external/mesa/src/gallium/auxiliary \ + external/drm \ + external/drm/include/drm + +LOCAL_MODULE := libmesa_pipe_r600 + +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_R600G diff --git a/src/gallium/state_trackers/Android.mk b/src/gallium/state_trackers/Android.mk index e0ae537505..65588694d6 100644 --- a/src/gallium/state_trackers/Android.mk +++ b/src/gallium/state_trackers/Android.mk @@ -28,6 +28,7 @@ LOCAL_C_INCLUDES := \ external/mesa/src/gallium/auxiliary \ external/mesa/src/egl/main \ external/mesa/src/gallium/state_trackers/egl \ + external/mesa/src/gallium/winsys \ external/mesa/src/gallium/winsys/sw \ external/mesa/src/gralloc \ external/drm \ 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 diff --git a/src/gallium/winsys/r600/Android.mk b/src/gallium/winsys/r600/Android.mk new file mode 100644 index 0000000000..643a59dc42 --- /dev/null +++ b/src/gallium/winsys/r600/Android.mk @@ -0,0 +1,38 @@ +ifeq ($(strip $(MESA_BUILD_R600G)),true) + +LOCAL_PATH := $(call my-dir) + +# from drm/Makefile +C_SOURCES = \ + bof.c \ + evergreen_hw_context.c \ + radeon_bo.c \ + radeon_pciid.c \ + r600_bo.c \ + r600_drm.c \ + r600_hw_context.c \ + r600_bomgr.c + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(addprefix drm/, $(C_SOURCES)) + +LOCAL_CFLAGS := \ + -std=c99 \ + -fvisibility=hidden \ + -Wno-sign-compare + +LOCAL_C_INCLUDES := \ + external/mesa/include \ + external/mesa/src/gallium/include \ + external/mesa/src/gallium/auxiliary \ + external/mesa/src/gallium/drivers/r600 \ + external/drm \ + external/drm/include/drm + +LOCAL_MODULE := libmesa_winsys_r600 + +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_R600G |