projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/blorp: Use genxml for gen7 state setup
[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 427a35f4f6e10771aea25cafe5108a3d0e80d039..785b6de25c0ca6246afcc71de43fbae581ea04e8 100644
(file)
--- a/
src/mesa/Android.libmesa_st_mesa.mk
+++ b/
src/mesa/Android.libmesa_st_mesa.mk
@@
-47,6
+47,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
@@
-54,14
+56,15
@@
endif
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \
- $(MESA_TOP)/src/glsl \
- $(MESA_TOP)/src/glsl/nir \
+ $(MESA_TOP)/src/compiler/nir \
$(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
+
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)