projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: reference __DRI_ATTRIB_SWAP_COPY token over the GLX one
[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 d7647a76bd0cf20c3b05436327c2c7a7c6e5c290..792117767b46abbdfed7b0cc1be0a9b5b3dbe759 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:
@@
-51,7
+49,7
@@
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_sse41
LOCAL_CFLAGS := \
LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_sse41
LOCAL_CFLAGS := \
- -msse4.1 \
+ -msse4.1
-mstackrealign
\
-DUSE_SSE41
endif
-DUSE_SSE41
endif
@@
-60,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_GENERATED_SOURCES += \
+ $(MESA_GEN_GLSL_H)
+
+LOCAL_STATIC_LIBRARIES += \
+ libmesa_nir
LOCAL_WHOLE_STATIC_LIBRARIES += \
LOCAL_WHOLE_STATIC_LIBRARIES += \
- libmesa_program
+ 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