diff options
Diffstat (limited to 'src/mesa/Android.libmesa_st_mesa.mk')
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index 3905ddc..22ba1b2 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -40,21 +40,15 @@ LOCAL_MODULE := libmesa_st_mesa LOCAL_SRC_FILES := \ $(MESA_GALLIUM_FILES) -LOCAL_GENERATED_SOURCES := $(MESA_GEN_GLSL_H) +LOCAL_GENERATED_SOURCES := \ + $(MESA_GEN_GLSL_H) \ + $(MESA_GEN_NIR_H) 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 := \ - -DUSE_SSE41 -endif - LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mesa/main \ @@ -65,6 +59,12 @@ LOCAL_C_INCLUDES := \ LOCAL_WHOLE_STATIC_LIBRARIES += \ libmesa_program +LOCAL_WHOLE_STATIC_LIBRARIES_x86 += \ + libmesa_sse41 \ + +LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += \ + libmesa_sse41 \ + LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl include $(LOCAL_PATH)/Android.gen.mk |