projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 28e3ae3)
glsl: android: add back missing generated glcpp include path
authorRob Herring <robh@kernel.org>
Thu, 14 Apr 2016 19:40:56 +0000 (14:40 -0500)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 21 Apr 2016 13:43:21 +0000 (14:43 +0100)
Commit 4db8f15a2576 ("glsl: move the android build scripts a level up")
dropped a generated include path for glcpp. Add it back adjusting for the
new location.

Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
src/compiler/Android.glsl.gen.mk patch | blob | history

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index b0df8a146c055b8a0a0a80d147e52cc628afc029..b2ea12cb4abdf70092272e31e6ca9513adfbaded 100644 (file)
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
 
 LOCAL_C_INCLUDES += \
        $(intermediates)/glsl \
+       $(intermediates)/glsl/glcpp \
        $(LOCAL_PATH)/glsl \
        $(LOCAL_PATH)/glsl/glcpp \