diff options
| author | Rob Herring <[email protected]> | 2016-02-02 14:45:07 -0600 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-04-01 13:44:22 +0100 |
| commit | 2d9e0f24e1a13648a9bceb03dbfb438e03c81fd7 (patch) | |
| tree | 0d7a53f5b4f459156753e66316d80b4b7b7ddd7f /src/mesa/Android.libmesa_st_mesa.mk | |
| parent | cdf7c6b83dad7eb6a7600af61403315b02dcf13f (diff) | |
Android: fix x86 gallium builds
Builds with gallium enabled fail on x86 with linker error:
external/mesa3d/src/mesa/vbo/vbo_exec_array.c:127: error: undefined reference to '_mesa_uint_array_min_max'
The problem is sse_minmax.c is not included in the libmesa_st_mesa
library. Since the SSE4.1 files are needed for both libmesa_st_mesa
and libmesa_dricore, move SSE4.1 files into a separate static library
that can be used by both.
Cc: "11.1 11.2" <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/Android.libmesa_st_mesa.mk')
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index 9fd9460a5ba..bbd39562785 100644 --- 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) +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_sse41 LOCAL_CFLAGS := \ -DUSE_SSE41 endif @@ -58,7 +60,7 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/include -LOCAL_WHOLE_STATIC_LIBRARIES := \ +LOCAL_WHOLE_STATIC_LIBRARIES += \ libmesa_program include $(LOCAL_PATH)/Android.gen.mk |