summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2012-02-08 15:07:33 -0800
committerChad Versace <[email protected]>2012-02-08 15:17:12 -0800
commit5497cc428fa7c6670d252d34f4a67c9498ae3895 (patch)
tree2adca955e4c9a871d267587965f657521cffa4b3 /src/glsl
parent192467108b282c19da3b11647a7a802b3d890193 (diff)
glsl: Fix Android build
The build was broken by the line below, added in commit 4f82fed4. s_expression.cpp:26: #include <limits> Mesa's half of the fix is to add 'external/astl/include' to the include path. The other half of the fix requires implementing numeric_limits<float>::infinity() in astl, for which I have patches submitted upstream for review. Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 754f3ccedca..cf793d65e35 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
$(LIBGLSL_CXX_FILES)
LOCAL_C_INCLUDES := \
+ external/astl/include \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa