These changes are necessary to avoid building errors in glsl and i965
---
src/glsl/Android.mk | 6 ++++--
src/mesa/drivers/dri/i965/Android.mk | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index f63b7da..6902ea4 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -42,7 +42,8 @@ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
$(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/src/glsl/nir
LOCAL_MODULE := libmesa_glsl
@@ -63,7 +64,8 @@ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
$(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(MESA_TOP)/src/glsl/nir
LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util
diff --git a/src/mesa/drivers/dri/i965/Android.mk
b/src/mesa/drivers/dri/i965/Android.mk
index d30a053..f9a914a 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -45,7 +45,8 @@ LOCAL_CFLAGS += \
endif
LOCAL_C_INCLUDES := \
- $(MESA_DRI_C_INCLUDES)
+ $(MESA_DRI_C_INCLUDES) \
+ $(MESA_TOP)/src/glsl/nir
LOCAL_SRC_FILES := \
$(i965_compiler_FILES) \
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
