mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-22 08:48:07 +02:00
107b9c70d0
Commit 463b7d0332c5("gallium: Enable ARM NEON CPU detection.")
introduced CPU feature detection based Android cpufeatures library.
Unfortunately it also added an assumption that if PIPE_OS_ANDROID is
defined, the library is also available, which is not true for the
standalone build without using Android build system.
Fix it by defining HAS_ANDROID_CPUFEATURES in Android.mk and replacing
respective #ifdefs to use it instead.
v2:
- Add a comment explaining why the separate flag is needed (Emil).
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
74 lines
2.6 KiB
Makefile
74 lines
2.6 KiB
Makefile
# Mesa 3-D graphics library
|
|
#
|
|
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
|
|
# Copyright (C) 2010-2011 LunarG Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included
|
|
# in all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
# DEALINGS IN THE SOFTWARE.
|
|
|
|
LOCAL_PATH := $(call my-dir)
|
|
|
|
# get C_SOURCES and GENERATED_SOURCES
|
|
include $(LOCAL_PATH)/Makefile.sources
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(C_SOURCES) \
|
|
$(NIR_SOURCES) \
|
|
$(RENDERONLY_SOURCES) \
|
|
$(VL_STUB_SOURCES)
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
$(GALLIUM_TOP)/auxiliary/util
|
|
|
|
ifeq ($(MESA_ENABLE_LLVM),true)
|
|
LOCAL_SRC_FILES += \
|
|
$(GALLIVM_SOURCES)
|
|
$(call mesa-build-with-llvm)
|
|
endif
|
|
|
|
LOCAL_CPPFLAGS += -std=c++11
|
|
|
|
# We need libmesa_nir to get NIR's generated include directories.
|
|
LOCAL_MODULE := libmesa_gallium
|
|
LOCAL_STATIC_LIBRARIES += libmesa_nir
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
|
|
LOCAL_CFLAGS += -DHAS_ANDROID_CPUFEATURES
|
|
|
|
# generate sources
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
intermediates := $(call local-generated-sources-dir)
|
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES))
|
|
|
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
|
|
|
|
$(intermediates)/indices/u_indices_gen.c \
|
|
$(intermediates)/indices/u_unfilled_gen.c \
|
|
$(intermediates)/util/u_format_srgb.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py
|
|
$(transform-generated-source)
|
|
|
|
$(intermediates)/util/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/util/u_format.csv
|
|
$(transform-generated-source)
|
|
|
|
LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H)
|
|
|
|
include $(GALLIUM_COMMON_MK)
|
|
include $(BUILD_STATIC_LIBRARY)
|