projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "i965: use nir_lower_indirect_derefs() for GLSL"
[mesa.git]
/
src
/
mesa
/
Android.libmesa_st_mesa.mk
diff --git
a/src/mesa/Android.libmesa_st_mesa.mk
b/src/mesa/Android.libmesa_st_mesa.mk
index 9fd9460a5bac4af55b0cb79a34d640e92aa770cf..3905ddcf2466eefe9e439f672575e6ce7fdc1688 100644
(file)
--- a/
src/mesa/Android.libmesa_st_mesa.mk
+++ b/
src/mesa/Android.libmesa_st_mesa.mk
@@
-40,6
+40,8
@@
LOCAL_MODULE := libmesa_st_mesa
LOCAL_SRC_FILES := \
$(MESA_GALLIUM_FILES)
LOCAL_SRC_FILES := \
$(MESA_GALLIUM_FILES)
+LOCAL_GENERATED_SOURCES := $(MESA_GEN_GLSL_H)
+
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
@@
-47,6
+49,8
@@
endif # x86
endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libmesa_sse41
LOCAL_CFLAGS := \
-DUSE_SSE41
endif
LOCAL_CFLAGS := \
-DUSE_SSE41
endif
@@
-58,9
+62,11
@@
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include
-LOCAL_WHOLE_STATIC_LIBRARIES
:
= \
+LOCAL_WHOLE_STATIC_LIBRARIES
+
= \
libmesa_program
libmesa_program
+LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl
+
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)