Mesa (10.1): android: add src/gallium/ auxiliary as include path for libmesa_dricore
Carl Worth
cworth at kemper.freedesktop.org
Mon Jun 23 23:30:00 UTC 2014
Module: Mesa
Branch: 10.1
Commit: 8e8fab2ef6f43b5a362a7a00f85cf624235724b9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e8fab2ef6f43b5a362a7a00f85cf624235724b9
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:08 2014 +0300
android: add src/gallium/auxiliary as include path for libmesa_dricore
This fixes:
In file included from
/home/adrian/workspace/mesa/mesa-master.git/src/mesa/vbo/vbo_exec_api.c:445:0:
/home/adrian/workspace/mesa/mesa-master.git/src/mesa/vbo/vbo_attrib_tmp.h:28:38:
fatal error: util/u_format_r11g11b10f.h: No such file or directory
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 0048483f73c0cdd6015f1f8a65b9e9d0fce4e93b)
---
src/mesa/Android.libmesa_dricore.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 0db5825..1332ebf 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -50,7 +50,8 @@ endif # MESA_ENABLE_ASM
LOCAL_C_INCLUDES := \
$(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
$(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/glsl
+ $(MESA_TOP)/src/glsl \
+ $(MESA_TOP)/src/gallium/auxiliary
LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_program
More information about the mesa-commit
mailing list