mirror of https://gitlab.freedesktop.org/mesa/mesa
clover: Prepare the build system for ICD support.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
parent
9e0b7f76f9
commit
07567c17f1
14
configure.ac
14
configure.ac
|
@ -593,6 +593,12 @@ AC_ARG_ENABLE([opencl],
|
|||
@<:@default=no@:>@])],
|
||||
[],
|
||||
[enable_opencl=no])
|
||||
AC_ARG_ENABLE([opencl_icd],
|
||||
[AS_HELP_STRING([--enable-opencl-icd],
|
||||
[Build an OpenCL ICD library to be loaded by an ICD implementation
|
||||
@<:@default=no@:>@])],
|
||||
[enable_opencl_icd="$enableval"],
|
||||
[enable_opencl_icd=no])
|
||||
AC_ARG_ENABLE([xlib-glx],
|
||||
[AS_HELP_STRING([--enable-xlib-glx],
|
||||
[make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])],
|
||||
|
@ -1356,8 +1362,16 @@ if test "x$enable_opencl" = xyes; then
|
|||
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS clover"
|
||||
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS opencl"
|
||||
enable_gallium_loader=yes
|
||||
|
||||
if test "x$enable_opencl_icd" = xyes; then
|
||||
OPENCL_LIBNAME="MesaOpenCL"
|
||||
else
|
||||
OPENCL_LIBNAME="OpenCL"
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
|
||||
AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
|
||||
AC_SUBST([OPENCL_LIBNAME])
|
||||
|
||||
dnl
|
||||
dnl Gallium configuration
|
||||
|
|
|
@ -12,6 +12,10 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/gallium/winsys \
|
||||
-I$(srcdir)
|
||||
|
||||
if HAVE_CLOVER_ICD
|
||||
AM_CPPFLAGS += -DHAVE_CLOVER_ICD
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
|
||||
|
||||
libcltgsi_la_CXXFLAGS = \
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
lib_LTLIBRARIES = libOpenCL.la
|
||||
lib_LTLIBRARIES = lib@OPENCL_LIBNAME@.la
|
||||
|
||||
libOpenCL_la_LDFLAGS = \
|
||||
lib@OPENCL_LIBNAME@_la_LDFLAGS = \
|
||||
$(LLVM_LDFLAGS) \
|
||||
-version-number 1:0
|
||||
|
||||
libOpenCL_la_LIBADD = \
|
||||
lib@OPENCL_LIBNAME@_la_LIBADD = \
|
||||
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \
|
||||
$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
|
||||
$(top_builddir)/src/gallium/state_trackers/clover/libclover.la \
|
||||
|
@ -28,14 +28,13 @@ libOpenCL_la_LIBADD = \
|
|||
-lclangBasic \
|
||||
$(LLVM_LIBS)
|
||||
|
||||
|
||||
libOpenCL_la_SOURCES =
|
||||
lib@OPENCL_LIBNAME@_la_SOURCES =
|
||||
|
||||
# Force usage of a C++ linker
|
||||
nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp
|
||||
nodist_EXTRA_lib@OPENCL_LIBNAME@_la_SOURCES = dummy.cpp
|
||||
|
||||
# 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
|
||||
all-local: lib@OPENCL_LIBNAME@.la
|
||||
$(MKDIR_P) $(top_builddir)/$(LIB_DIR)
|
||||
ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/
|
||||
ln -f .libs/lib@OPENCL_LIBNAME@.so* $(top_builddir)/$(LIB_DIR)/
|
||||
|
|
Loading…
Reference in New Issue