projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir: Add a nir_foreach_uniform_variable helper
[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 e4a52677cf805064bfc3c15db91d96c2cda2819a..8eb6aabe836f35f2c9bcc14112583ef0bb4e0bec 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:
@@
-41,36
+39,36
@@
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SRC_FILES := \
$(MESA_FILES)
LOCAL_SRC_FILES := \
$(MESA_FILES)
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
ifeq ($(TARGET_ARCH),x86)
LOCAL_SRC_FILES += $(X86_FILES)
endif # x86
-endif # MESA_ENABLE_ASM
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_SRC_FILES += \
- $(SRCDIR)main/streaming-load-memcpy.c \
- $(SRCDIR)main/sse_minmax.c
-LOCAL_CFLAGS := -msse4.1
-endif
-
-ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
-LOCAL_CFLAGS += \
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libmesa_sse41
+LOCAL_CFLAGS := \
+ -msse4.1 -mstackrealign \
-DUSE_SSE41
endif
LOCAL_C_INCLUDES := \
-DUSE_SSE41
endif
LOCAL_C_INCLUDES := \
- $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
- $(MESA_TOP)/src \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/glsl \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_TOP)/src/mesa/main \
+ $(MESA_TOP)/src/compiler/nir \
+ $(MESA_TOP)/src/gallium/include \
+ $(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