Module: Mesa
Branch: master
Commit: fd3234891f7203d6b2b0992c34e880df325f75ea
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd3234891f7203d6b2b0992c34e880df325f75ea
Author: Eric Anholt <e...@anholt.net>
Date: Sun Jun 7 11:57:46 2015 -0700
gallium: Enable build of NIR support on Android.
v2: Add a comment explaining why we link libmesa_glsl.
Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/gallium/auxiliary/Android.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 2d91752..86430eb 100644
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -30,6 +30,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(C_SOURCES) \
+ $(NIR_SOURCES) \
$(VL_STUB_SOURCES)
LOCAL_C_INCLUDES := \
@@ -43,7 +44,9 @@ LOCAL_SRC_FILES += \
LOCAL_CPPFLAGS := -std=c++11
endif
+# We need libmesa_glsl to get NIR's generated include directories.
LOCAL_MODULE := libmesa_gallium
+LOCAL_STATIC_LIBRARIES += libmesa_glsl
# generate sources
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
