Module: Mesa
Branch: 8.0
Commit: 54f7391664d2cffe1f719d11fec1f18db672be5d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=54f7391664d2cffe1f719d11fec1f18db672be5d
Author: Chad Versace <chad.vers...@linux.intel.com>
Date: Wed Feb 8 15:07:33 2012 -0800
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.vers...@linux.intel.com>
(cherry picked from commit 5497cc428fa7c6670d252d34f4a67c9498ae3895)
---
src/glsl/Android.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index d7d17dd..84a8655 100644
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
$(LIBGLSL_CXX_SOURCES)
LOCAL_C_INCLUDES := \
+ external/astl/include \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
