mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-03-10 22:20:40 +01:00
60c581b57d
Fixes the following building errors and resolves Bug 110922
Fixes gallium_dri target missing symbols at linking.
external/mesa/src/gallium/winsys/virgl/drm/Android.mk:
error: libmesa_winsys_virgl (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
external/mesa/src/gallium/winsys/virgl/vtest/Android.mk:
error: libmesa_winsys_virgl_vtest (STATIC_LIBRARIES android-x86_64) missing libmesa_winsys_virgl_common (STATIC_LIBRARIES android-x86_64)
...
build/core/main.mk:728: error: exiting from previous errors.
In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c:34:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
In file included from external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.c:32:
external/mesa/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h:35:10:
fatal error: 'virgl_resource_cache.h' file not found
#include "virgl_resource_cache.h"
^~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Fixes: b18f09a ("virgl: Introduce virgl_resource_cache")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Tested-by: Clayton Craft <clayton.a.craft@intel.com>
58 lines
2.3 KiB
Makefile
58 lines
2.3 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.
|
|
|
|
# src/gallium/Android.mk
|
|
|
|
GALLIUM_TOP := $(call my-dir)
|
|
GALLIUM_COMMON_MK := $(GALLIUM_TOP)/Android.common.mk
|
|
GALLIUM_TARGET_DRIVERS :=
|
|
|
|
SUBDIRS := auxiliary
|
|
SUBDIRS += auxiliary/pipe-loader
|
|
|
|
#
|
|
# Gallium drivers and their respective winsys
|
|
#
|
|
|
|
SUBDIRS += winsys/sw/kms-dri winsys/sw/dri drivers/softpipe
|
|
SUBDIRS += winsys/freedreno/drm drivers/freedreno
|
|
SUBDIRS += winsys/i915/drm drivers/i915
|
|
SUBDIRS += winsys/nouveau/drm drivers/nouveau
|
|
SUBDIRS += winsys/kmsro/drm drivers/kmsro
|
|
SUBDIRS += winsys/radeon/drm drivers/r300
|
|
SUBDIRS += winsys/radeon/drm drivers/r600
|
|
SUBDIRS += winsys/radeon/drm winsys/amdgpu/drm drivers/radeonsi
|
|
SUBDIRS += winsys/vc4/drm drivers/vc4
|
|
SUBDIRS += winsys/virgl/common winsys/virgl/drm winsys/virgl/vtest drivers/virgl
|
|
SUBDIRS += winsys/svga/drm drivers/svga
|
|
SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
|
|
SUBDIRS += state_trackers/dri
|
|
SUBDIRS += winsys/iris/drm drivers/iris
|
|
SUBDIRS += winsys/lima/drm drivers/lima
|
|
|
|
# sort to eliminate any duplicates
|
|
INC_DIRS := $(call all-named-subdir-makefiles,$(sort $(SUBDIRS)))
|
|
# targets/dri must be included last
|
|
INC_DIRS += $(call all-named-subdir-makefiles,targets/dri)
|
|
|
|
include $(INC_DIRS)
|