OSDN Git Service

glsl: Fix Android build
authorChad Versace <chad.versace@linux.intel.com>
Wed, 8 Feb 2012 23:07:33 +0000 (15:07 -0800)
committerChad Versace <chad.versace@linux.intel.com>
Fri, 23 Mar 2012 23:28:38 +0000 (16:28 -0700)
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>
(cherry picked from commit 5497cc428fa7c6670d252d34f4a67c9498ae3895)

src/glsl/Android.mk

index d7d17dd..84a8655 100644 (file)
@@ -39,6 +39,7 @@ LOCAL_SRC_FILES := \
        $(LIBGLSL_CXX_SOURCES)
 
 LOCAL_C_INCLUDES := \
+       external/astl/include \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa