diff options
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/Android.common.mk b/Android.common.mk index 9f64c22..ebd76f8 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -43,6 +43,7 @@ LOCAL_CFLAGS += \ -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION) LOCAL_CFLAGS += \ + -D__STDC_CONSTANT_MACROS \ -D__STDC_LIMIT_MACROS \ -DHAVE___BUILTIN_EXPECT \ -DHAVE___BUILTIN_FFS \ @@ -59,6 +60,7 @@ LOCAL_CFLAGS += \ -DHAVE___BUILTIN_UNREACHABLE \ -DHAVE_PTHREAD=1 \ -DHAVE_DLOPEN \ + -DTEXTURE_FLOAT_ENABLED \ -fvisibility=hidden \ -Wno-sign-compare @@ -66,17 +68,32 @@ LOCAL_CFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +x86_flags := \ + -DUSE_SSE41 \ + +x86_64_flags := \ + -DUSE_SSE41 \ + ifeq ($(strip $(MESA_ENABLE_ASM)),true) -ifeq ($(TARGET_ARCH),x86) -LOCAL_CFLAGS += \ +x86_flags += \ -DUSE_X86_ASM \ + -DUSE_MMX_ASM \ + -DUSE_3DNOW_ASM \ + -DUSE_SSE_ASM \ + +x86_64_flags += \ + -DUSE_X86_64_ASM \ endif -endif + +LOCAL_ASFLAGS_x86 += $(x86_flags) +LOCAL_ASFLAGS_x86_64 += $(x86_64_flags) +LOCAL_CFLAGS_x86 += $(x86_flags) +LOCAL_CFLAGS_x86_64 += $(x86_64_flags) ifeq ($(MESA_ENABLE_LLVM),true) LOCAL_CFLAGS += \ - -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \ + -DHAVE_LLVM=0x030$(if $(filter 5,$(MESA_ANDROID_MAJOR_VERSION)),5,$(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)),7,8)) -DMESA_LLVM_VERSION_PATCH=0 \ -D__STDC_CONSTANT_MACROS \ -D__STDC_FORMAT_MACROS \ -D__STDC_LIMIT_MACROS @@ -91,7 +108,7 @@ endif endif LOCAL_CPPFLAGS += \ - $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ + $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-std=c++11) \ -Wno-error=non-virtual-dtor \ -Wno-non-virtual-dtor |