projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vbo: rename vbo_save_context::buffer to buffer_map
[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 a3e6c6d55ae441f38aee5d5b70bc396a73dff320..34fd8581c2df19b00caaa9e2312971a37473608e 100644
(file)
--- a/
src/mesa/Android.libmesa_dricore.mk
+++ b/
src/mesa/Android.libmesa_dricore.mk
@@
-24,8
+24,6
@@
# libmesa_dricore.a
# ----------------------------------------------------------------------
# libmesa_dricore.a
# ----------------------------------------------------------------------
-ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
-
LOCAL_PATH := $(call my-dir)
# Import the following variables:
LOCAL_PATH := $(call my-dir)
# Import the following variables:
@@
-48,9
+46,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
@@
-61,13
+58,19
@@
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mesa/main \
$(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/mesa/main \
$(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_TOP)/src/gallium/auxiliary \
+ $(dir $(MESA_GEN_GLSL_H))
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- libmesa_program
+LOCAL_GENERATED_SOURCES += \
+ $(MESA_GEN_GLSL_H)
+
+LOCAL_STATIC_LIBRARIES += \
+ libmesa_nir
+
+LOCAL_WHOLE_STATIC_LIBRARIES += \
+ libmesa_program \
+ libmesa_git_sha1
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)
-
-endif # MESA_BUILD_CLASSIC