projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir: Allow opt_peephole_sel to be more aggressive in flattening IFs.
[mesa.git]
/
src
/
mesa
/
Android.libmesa_dricore.mk
diff --git
a/src/mesa/Android.libmesa_dricore.mk
b/src/mesa/Android.libmesa_dricore.mk
index cd31e14822222cefe097f31125ac699d95b24c6d..86196ceb36abf10513316005d31655174fd6737e 100644
(file)
--- a/
src/mesa/Android.libmesa_dricore.mk
+++ b/
src/mesa/Android.libmesa_dricore.mk
@@
-48,9
+48,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_SRC_FILES += \
- main/streaming-load-memcpy.c \
- main/sse_minmax.c
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libmesa_sse41
LOCAL_CFLAGS := \
-msse4.1 \
-DUSE_SSE41
LOCAL_CFLAGS := \
-msse4.1 \
-DUSE_SSE41
@@
-59,12
+58,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/include \
$(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(dir $(MESA_GEN_GLSL_H))
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+LOCAL_GENERATED_SOURCES += \
+ $(MESA_GEN_GLSL_H)
+
+LOCAL_WHOLE_STATIC_LIBRARIES += \
libmesa_program
include $(LOCAL_PATH)/Android.gen.mk
libmesa_program
include $(LOCAL_PATH)/Android.gen.mk