glsl: Rewrite atan2 implementation to fix accuracy and handling of zero/infinity.

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index a75d4e721df410e5d014a14a7ad99b67010ac374..4fa02ae05214708e44f9ced99afa0d525519dd99 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -44,7 +44,6 @@ LOCAL_CFLAGS += \
 
 LOCAL_CFLAGS += \
        -DENABLE_SHADER_CACHE \
-       -D__STDC_LIMIT_MACROS \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
@@ -52,7 +51,7 @@ LOCAL_CFLAGS += \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
-       _DHAVE_FUNC_ATTRIBUTE_ALIAS \
+       -DHAVE_FUNC_ATTRIBUTE_ALIAS \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -64,6 +63,11 @@ LOCAL_CFLAGS += \
        -fvisibility=hidden \
        -Wno-sign-compare
 
+LOCAL_CPPFLAGS += \
+       -D__STDC_CONSTANT_MACROS \
+       -D__STDC_FORMAT_MACROS \
+       -D__STDC_LIMIT_MACROS
+
 # mesa requires at least c99 compiler
 LOCAL_CONLYFLAGS += \
        -std=c99
@@ -78,10 +82,7 @@ endif
 
 ifeq ($(MESA_ENABLE_LLVM),true)
 LOCAL_CFLAGS += \
-       -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
-       -D__STDC_CONSTANT_MACROS \
-       -D__STDC_FORMAT_MACROS \
-       -D__STDC_LIMIT_MACROS
+       -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
 endif
 
 ifneq ($(LOCAL_IS_HOST_MODULE),true)