diff options
| author | Tomasz Figa <tomasz.figa@gmail.com> | 2014-09-27 16:19:59 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-10-03 01:25:28 +0100 |
| commit | d703abf735bc2fe27af893d07e44598b8601b172 (patch) | |
| tree | 85a582f9ac5105add9326c027366c47f361755e1 /src/mesa | |
| parent | 493bfa54a57e2feddd887ba0ec3d5ef139e82f3b (diff) | |
| download | external_mesa3d-d703abf735bc2fe27af893d07e44598b8601b172.zip external_mesa3d-d703abf735bc2fe27af893d07e44598b8601b172.tar.gz external_mesa3d-d703abf735bc2fe27af893d07e44598b8601b172.tar.bz2 | |
util: Include in Android builds
This patch fixes Android build failures by including src/util directory
in compilation. Files inside of this directory are compiled into
libmesa_util static library and linked with resulting libGLES_mesa.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 1 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_glsl_utils.mk | 4 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 1 | ||||
| -rw-r--r-- | src/mesa/program/Android.mk | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index 28d6feb..e1a5a17 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -55,6 +55,7 @@ endif LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/gallium/auxiliary diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk index e93891f..a9f6ff5 100644 --- a/src/mesa/Android.libmesa_glsl_utils.mk +++ b/src/mesa/Android.libmesa_glsl_utils.mk @@ -36,11 +36,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := libmesa_glsl_utils LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi LOCAL_SRC_FILES := \ - main/hash_table.c \ main/imports.c \ program/prog_hash_table.c \ program/symbol_table.c @@ -59,11 +59,11 @@ LOCAL_IS_HOST_MODULE := true LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi LOCAL_SRC_FILES := \ - main/hash_table.c \ main/imports.c \ program/prog_hash_table.c \ program/symbol_table.c diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index e6374a6..e486e1a 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -50,6 +50,7 @@ LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/glsl \ $(MESA_TOP)/src/mapi diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index e85afe6..a237b65 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -71,6 +71,7 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l LOCAL_C_INCLUDES := \ $(intermediates) \ + $(MESA_TOP)/src \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/glsl |