mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 23:50:11 +01:00
Updates Makefile.sources and fixes the following building error:
In file included from external/mesa/src/vulkan/util/vk_format.c:24:
In file included from external/mesa/src/vulkan/util/vk_format.h:28:
external/mesa/src/util/format/u_format.h:33:10: fatal error: 'pipe/p_format.h' file not found
#include "pipe/p_format.h"
^~~~~~~~~~~~~~~~~
1 error generated.
Fixes: 3a28281 ("util: Add a mapping from VkFormat to PIPE_FORMAT.")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
75 lines
2.6 KiB
Makefile
75 lines
2.6 KiB
Makefile
# Copyright © 2017 Mauro Rossi <issor.oruam@gmail.com>
|
|
# Copyright © 2017 Intel Corporation
|
|
#
|
|
# 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 (including the next
|
|
# paragraph) 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)
|
|
|
|
# Import variables
|
|
include $(LOCAL_PATH)/Makefile.sources
|
|
|
|
#
|
|
# libmesa_vulkan_util
|
|
#
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := libmesa_vulkan_util
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
|
|
intermediates := $(call local-generated-sources-dir)
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
$(MESA_TOP)/include/vulkan \
|
|
$(MESA_TOP)/src/vulkan/util \
|
|
$(MESA_TOP)/src/gallium/include
|
|
|
|
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
|
|
LOCAL_C_INCLUDES += \
|
|
frameworks/native/libs/nativebase/include \
|
|
frameworks/native/libs/nativewindow/include \
|
|
frameworks/native/libs/arect/include
|
|
LOCAL_HEADER_LIBRARIES += libcutils_headers libsystem_headers
|
|
endif
|
|
|
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \
|
|
$(VULKAN_UTIL_GENERATED_FILES))
|
|
|
|
LOCAL_SRC_FILES := $(VULKAN_UTIL_FILES) $(VULKAN_WSI_FILES)
|
|
|
|
vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
|
|
|
|
$(firstword $(LOCAL_GENERATED_SOURCES)): $(MESA_TOP)/src/vulkan/util/gen_enum_to_str.py \
|
|
$(vulkan_api_xml)
|
|
@echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
|
|
@mkdir -p $(dir $@)
|
|
$(hide) $(MESA_PYTHON2) $< \
|
|
--xml $(vulkan_api_xml) \
|
|
--outdir $(dir $@)
|
|
|
|
$(lastword $(LOCAL_GENERATED_SOURCES)): $(firstword $(LOCAL_GENERATED_SOURCES))
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)/util
|
|
|
|
ifeq ($(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7),)
|
|
LOCAL_SHARED_LIBRARIES += libnativewindow
|
|
endif
|
|
|
|
include $(MESA_COMMON_MK)
|
|
include $(BUILD_STATIC_LIBRARY)
|