diff options
Diffstat (limited to 'src/mesa/Android.libmesa_dricore.mk')
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index 86196ce..8de90b8 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -31,6 +31,7 @@ LOCAL_PATH := $(call my-dir) # Import the following variables: # MESA_FILES # X86_FILES +# X86_64_FILES include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) @@ -42,19 +43,10 @@ LOCAL_SRC_FILES := \ $(MESA_FILES) ifeq ($(strip $(MESA_ENABLE_ASM)),true) -ifeq ($(TARGET_ARCH),x86) - LOCAL_SRC_FILES += $(X86_FILES) -endif # x86 + LOCAL_SRC_FILES_x86 += $(X86_FILES) + LOCAL_SRC_FILES_x86_64 += $(X86_64_FILES) endif # MESA_ENABLE_ASM -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_sse41 -LOCAL_CFLAGS := \ - -msse4.1 \ - -DUSE_SSE41 -endif - LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa/main \ @@ -69,6 +61,12 @@ LOCAL_GENERATED_SOURCES += \ LOCAL_WHOLE_STATIC_LIBRARIES += \ libmesa_program +LOCAL_WHOLE_STATIC_LIBRARIES_x86 += \ + libmesa_sse41 \ + +LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += \ + libmesa_sse41 \ + include $(LOCAL_PATH)/Android.gen.mk include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |