From: Chad Versace <chad.versace@linux.intel.com>
Date: Wed, 8 Feb 2012 23:07:33 +0000 (-0800)
Subject: glsl: Fix Android build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5497cc428fa7c6670d252d34f4a67c9498ae3895;p=mesa.git

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 <chad.versace@linux.intel.com>
---

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