mirror of
https://gitee.com/openharmony/third_party_mesa3d
synced 2024-11-24 16:00:56 +00:00
build: Build pipe-loader before gallium tests
And don't build it from other Makefiles. That's awful, and breaks distclean. Tested-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
parent
0d3b1b0e2e
commit
2f7a37d858
@ -1397,10 +1397,6 @@ if test "x$enable_opencl" = xyes; then
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
|
||||
|
||||
if test "x$enable_gallium_gbm" = xyes || test "x$enable_opencl" = xyes; then
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader"
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Gallium configuration
|
||||
dnl
|
||||
@ -1666,6 +1662,10 @@ if test "x$enable_gallium_tests" = xyes; then
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes)
|
||||
|
||||
if test "x$enable_gallium_loader" = xyes; then
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader"
|
||||
fi
|
||||
|
||||
dnl Directory for VDPAU libs
|
||||
AC_ARG_WITH([vdpau-libdir],
|
||||
[AS_HELP_STRING([--with-vdpau-libdir=DIR],
|
||||
|
@ -32,11 +32,8 @@ libOpenCL_la_SOURCES =
|
||||
# Force usage of a C++ linker
|
||||
nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp
|
||||
|
||||
PIPE_BUILD_DIR = $(top_builddir)/src/gallium/targets/pipe-loader
|
||||
|
||||
# Provide compatibility with scripts for the old Mesa build system for
|
||||
# a while by putting a link to the driver into /lib of the build tree.
|
||||
all-local: libOpenCL.la
|
||||
@$(MAKE) -C $(PIPE_BUILD_DIR)
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR)
|
||||
ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/
|
||||
|
@ -26,9 +26,5 @@ tri_SOURCES = tri.c
|
||||
|
||||
quad_tex_SOURCES = quad-tex.c
|
||||
|
||||
all-local:
|
||||
@$(MAKE) -C $(PIPE_SRC_DIR)
|
||||
|
||||
clean-local:
|
||||
@$(MAKE) -C $(PIPE_SRC_DIR) clean
|
||||
-rm -f result.bmp
|
||||
|
Loading…
Reference in New Issue
Block a user